Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32411
Modified Files:
opertoscalar.cpp
Log Message:
stringLength bug fixed
Index: opertoscalar.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Conversions/opertoscalar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opertoscalar.cpp 19 Nov 2006 13:08:27 -0000 1.2
--- opertoscalar.cpp 20 Nov 2006 18:32:50 -0000 1.3
***************
*** 65,79 ****
}
! if (xString->val.str[0])
! ret.assign(xString->val.str + 1, xString->val.str[0]);
// expirimental workaround for apparent bug in Excel API
// where the value for the string length wraps around the byte
! //int stringLength = xString->val.str[0];
! //if (stringLength < 0) stringLength += 257;
! //if (stringLength)
! // ret.assign(xString->val.str + 1, stringLength);
! if (needToFree)
Excel(xlFree, 0, 1, &xTemp);
} catch (...) {
--- 65,80 ----
}
! //if (xString->val.str[0])
! // ret.assign(xString->val.str + 1, xString->val.str[0]);
// expirimental workaround for apparent bug in Excel API
// where the value for the string length wraps around the byte
! int stringLength = xString->val.str[0];
! if (stringLength < 0) stringLength += 256;
! if (stringLength)
! ret.assign(xString->val.str + 1, stringLength);
! if (needToFree) {
Excel(xlFree, 0, 1, &xTemp);
+ }
} catch (...) {
|
