[ObjectHandler-cvs] ObjectHandler/ohxl callingrange.cpp, 1.14, 1.15 functioncall.cpp, 1.12, 1.13 objecthandlerxl.cpp, 1.23, 1.24

[Ferdinando A. <na...@us...>]

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

Modified Files:
	callingrange.cpp functioncall.cpp objecthandlerxl.cpp 
Log Message:
1) thisToThat functions' signature changed into thisToThat(const This&, That&)
2) using iterator based vectorToOper for vectorToOper(const std::vector<T> &, OPER &)

Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** objecthandlerxl.cpp	2 Jan 2007 16:36:19 -0000	1.23
--- objecthandlerxl.cpp	4 Jan 2007 11:18:36 -0000	1.24
***************
*** 71,75 ****
              if (xOldName.xltype == xltypeStr) {
                  string oldKey;
!                 operToScalar(oldKey, xOldName);
                  Excel(xlFree, 0, 1, &xOldName);
                  rangeMap::const_iterator i = callingRanges_.find(oldKey);
--- 71,75 ----
              if (xOldName.xltype == xltypeStr) {
                  string oldKey;
!                 operToScalar(xOldName, oldKey);
                  Excel(xlFree, 0, 1, &xOldName);
                  rangeMap::const_iterator i = callingRanges_.find(oldKey);
***************
*** 243,247 ****
              Excel(xlfReftext, &xRangeText, 1, xRangeRef);
              string rangeStr;
!             operToScalar(rangeStr, xRangeText);
              Excel(xlFree, 0, 1, &xRangeText);
              RangeReference selectionReference(rangeStr);
--- 243,247 ----
              Excel(xlfReftext, &xRangeText, 1, xRangeRef);
              string rangeStr;
!             operToScalar(xRangeText, rangeStr);
              Excel(xlFree, 0, 1, &xRangeText);
              RangeReference selectionReference(rangeStr);

Index: callingrange.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/callingrange.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** callingrange.cpp	3 Jan 2007 17:40:25 -0000	1.14
--- callingrange.cpp	4 Jan 2007 11:18:36 -0000	1.15
***************
*** 116,120 ****
  
              string address;
!             operToScalar(address, xDef);
              Excel(xlfTextref, &xRef, 1, TempStrStl(address.substr(1)));
  
--- 116,120 ----
  
              string address;
!             operToScalar(xDef, address);
              Excel(xlfTextref, &xRef, 1, TempStrStl(address.substr(1)));
  
***************
*** 150,154 ****
  
              string address;
!             operToScalar(address, xDef);
              Excel(xlFree, 0, 1, &xDef);
              return address;
--- 150,154 ----
  
              string address;
!             operToScalar(xDef, address);
              Excel(xlFree, 0, 1, &xDef);
              return address;

Index: functioncall.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** functioncall.cpp	16 Nov 2006 12:38:40 -0000	1.12
--- functioncall.cpp	4 Jan 2007 11:18:36 -0000	1.13
***************
*** 79,83 ****
              try {
                  Excel(xlfGetCell, &xAddress, 2, TempNum(1), getCallerReference());
!                 operToScalar(address_, xAddress);
                  Excel(xlFree, 0, 1, &xAddress);
              } catch (...) {
--- 79,83 ----
              try {
                  Excel(xlfGetCell, &xAddress, 2, TempNum(1), getCallerReference());
!                 operToScalar(xAddress, address_);
                  Excel(xlFree, 0, 1, &xAddress);
              } catch (...) {
***************
*** 99,103 ****
              try {
                  Excel(xlfGetFormula, &xFormula, 1, getCallerReference());
!                 operToScalar(formula_, xFormula);
                  Excel(xlFree, 0, 1, &xFormula);
              } catch (const std::exception &e) {
--- 99,103 ----
              try {
                  Excel(xlfGetFormula, &xFormula, 1, getCallerReference());
!                 operToScalar(xFormula, formula_);
                  Excel(xlFree, 0, 1, &xFormula);
              } catch (const std::exception &e) {