objecthandler-cvs

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

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

Modified Files:
	objecthandlerxl.cpp 
Log Message:
reformat error message depending on context:
- logfile: "cell address - function name - message"
- calling range: "function name - message"

Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** objecthandlerxl.cpp	29 Oct 2006 16:13:44 -0000	1.20
--- objecthandlerxl.cpp	30 Oct 2006 16:21:40 -0000	1.21
***************
*** 221,229 ****
  
      void ObjectHandlerXL::logError(const std::string& message, const bool &append) {
!         logMessage(message, 2);
          if (FunctionCall::instance().getCallerType() == Cell) {
              boost::shared_ptr<CallingRange> callingRange = getCallingRange(true);
!             callingRange->setErrorMessage(message, append);
          }
      }
  
--- 221,235 ----
  
      void ObjectHandlerXL::logError(const std::string& message, const bool &append) {
!         std::ostringstream msgLog;
          if (FunctionCall::instance().getCallerType() == Cell) {
+             FunctionCall::instance().setError();
+             std::ostringstream msgCell;
+             msgCell << FunctionCall::instance().getFunctionName() << " - " << message;
              boost::shared_ptr<CallingRange> callingRange = getCallingRange(true);
!             callingRange->setErrorMessage(msgCell.str(), append);
!             msgLog << FunctionCall::instance().getAddressString() << " - ";
          }
+         msgLog << FunctionCall::instance().getFunctionName() << " - " << message;
+         logMessage(msgLog.str(), 2);
      }