objecthandler-cvs

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

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

Modified Files:
	manual.cpp 
Log Message:
fix for The Bug of the Day

Index: manual.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Functions/manual.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** manual.cpp	3 Oct 2006 09:32:37 -0000	1.1
--- manual.cpp	9 Oct 2006 09:48:27 -0000	1.2
***************
*** 65,71 ****
          // invoke the utility function
  
! 		static std::map < std::string, long > iterators;
          static long returnValue;
! 		returnValue = iterators[ObjHandler::FunctionCall::instance().getAddressString()]++;
  
          // convert and return the return value
--- 65,71 ----
          // invoke the utility function
  
!         static std::map < std::string, long > iterators;
          static long returnValue;
!         returnValue = iterators[ObjHandler::FunctionCall::instance().getAddressString()]++;
  
          // convert and return the return value
***************
*** 84,91 ****
  
  XLL_DEC long *ohFunctionCount() {
! 	// FUNCTION_COUNT gives the number of autogenerated functions,
! 	// add 4 for the hand-written functions in this file
! 	static long returnValue = FUNCTION_COUNT + 4;
! 	return &returnValue;
  }
  
--- 84,91 ----
  
  XLL_DEC long *ohFunctionCount() {
!     // FUNCTION_COUNT gives the number of autogenerated functions,
!     // add 4 for the hand-written functions in this file
!     static long returnValue = FUNCTION_COUNT + 4;
!     return &returnValue;
  }
  
***************
*** 122,126 ****
          functionCall = boost::shared_ptr < ObjHandler::FunctionCall > 
              ( new ObjHandler::FunctionCall("ohPack") );
!  
          Excel(xlCoerce, &xMulti, 2, xInputRange, TempInt(xltypeMulti));
  
--- 122,126 ----
          functionCall = boost::shared_ptr < ObjHandler::FunctionCall > 
              ( new ObjHandler::FunctionCall("ohPack") );
! 
          Excel(xlCoerce, &xMulti, 2, xInputRange, TempInt(xltypeMulti));
  
***************
*** 174,178 ****
          char *line,
          long *index,
!         char *type,
          OPER *delim) {
      boost::shared_ptr < ObjHandler::FunctionCall > functionCall;
--- 174,178 ----
          char *line,
          long *index,
!         OPER *type,
          OPER *delim) {
      boost::shared_ptr < ObjHandler::FunctionCall > functionCall;
***************
*** 187,195 ****
          ObjHandler::ObjectHandlerXL::instance().resetCaller();
  
!         // invoke the utility function
  
          std::string delimStr;
          ObjHandler::operToScalar(delimStr, *delim, "[:space:]");
  
          if (*index<1) {
              std::stringstream msg;
--- 187,200 ----
          ObjHandler::ObjectHandlerXL::instance().resetCaller();
  
!         // convert the inputs
! 
!         std::string typeStr;
!         ObjHandler::operToScalar(typeStr, *type, "NUMBER");
  
          std::string delimStr;
          ObjHandler::operToScalar(delimStr, *delim, "[:space:]");
  
+         // invoke the utility function
+ 
          if (*index<1) {
              std::stringstream msg;
***************
*** 211,215 ****
  
          static XLOPER xRet;
!         std::string typeStr(type);
          if (typeStr.empty() || ObjHandler::uppercase(typeStr) == "NUMBER") {
              double ret;
--- 216,220 ----
  
          static XLOPER xRet;
! 
          if (typeStr.empty() || ObjHandler::uppercase(typeStr) == "NUMBER") {
              double ret;