objecthandler-cvs

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

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

Modified Files:
	objecthandlerxl.cpp 
Log Message:
fix excel crash

Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** objecthandlerxl.cpp	25 Jul 2006 18:14:36 -0000	1.13
--- objecthandlerxl.cpp	29 Aug 2006 13:47:14 -0000	1.14
***************
*** 119,129 ****
          }
  
!         boost::shared_ptr<CallingRange> callingRange = getCallingRange();
!         callingRange->deleteObject(objectID, object);
!         checkName(objectID);
!         callingRange->registerObject(objectID, object);
  
!         std::string objectIDCounter = ObjectHandler::storeObject(objectID, object);
!         return objectIDCounter + "#" + callingRange->updateCount();
      }
  
--- 119,137 ----
          }
  
!         if (FunctionCall::instance().getCallerType() == Cell) {
!             boost::shared_ptr<CallingRange> callingRange = 
!                 getCallingRange();
!             callingRange->deleteObject(objectID, object);
!             checkName(objectID);
!             callingRange->registerObject(objectID, object);
  
!             std::string objectIDCounter = 
!                 ObjectHandler::storeObject(objectID, object);
!             return objectIDCounter + "#" + 
!                 callingRange->updateCount();
!         } else {
!             ObjectHandler::storeObject(objectID, object);
!             return objectID;
!         }
      }