[ObjectHandler-cvs] ObjectHandler/ohxl objecthandlerxl.cpp, 1.12, 1.13

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18152/ohxl

Modified Files:
	objecthandlerxl.cpp 
Log Message:
fix problems with nested functions

Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** objecthandlerxl.cpp	17 Jul 2006 17:46:46 -0000	1.12
--- objecthandlerxl.cpp	25 Jul 2006 18:14:36 -0000	1.13
***************
*** 102,106 ****
              return;
          boost::shared_ptr<CallingRange> callingRange = getCallingRange();
!         if (!callingRange) {
              callingRange = boost::shared_ptr<CallingRange>(new CallingRange);
              callingRanges_[callingRange->getKey()] = callingRange;
--- 102,106 ----
              return;
          boost::shared_ptr<CallingRange> callingRange = getCallingRange();
!         if (!callingRange && createIfNone) {
              callingRange = boost::shared_ptr<CallingRange>(new CallingRange);
              callingRanges_[callingRange->getKey()] = callingRange;
***************
*** 113,117 ****
              std::string objectID,
              const boost::shared_ptr<Object> &object) {
-         resetCaller(true);
  
          if (objectID.empty()) {
--- 113,116 ----