Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Functions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18372/ohxl/Functions
Modified Files:
manual.cpp
Log Message:
rename ohDependsOn() to ohTrigger() and refine behavior
Index: manual.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Functions/manual.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** manual.cpp 8 Dec 2006 14:46:13 -0000 1.11
--- manual.cpp 11 Dec 2006 13:12:37 -0000 1.12
***************
*** 25,29 ****
#include <ohxl/functioncall.hpp>
#include <ohxl/Functions/functioncount.hpp>
- //#include <sstream>
#include <map>
--- 25,28 ----
***************
*** 60,66 ****
void validateReference(const XLOPER *xReference, const std::string &name) {
! if (xReference->xltype != xltypeMissing
! && xReference->xltype != xltypeRef
! && xReference->xltype != xltypeSRef) {
std::ostringstream msg;
msg << "parameter '" << name << "' is not a valid range reference";
--- 59,63 ----
void validateReference(const XLOPER *xReference, const std::string &name) {
! if (xReference->xltype == xltypeErr && xReference->val.err == xlerrRef) {
std::ostringstream msg;
msg << "parameter '" << name << "' is not a valid range reference";
***************
*** 69,91 ****
}
! XLL_DEC long *ohDependsOn(
! XLOPER *dummy0,
! XLOPER *dummy1,
! XLOPER *dummy2,
! XLOPER *dummy3,
! XLOPER *dummy4,
! XLOPER *dummy5,
! XLOPER *dummy6,
! XLOPER *dummy7,
! XLOPER *dummy8,
! XLOPER *dummy9) {
boost::shared_ptr<ObjHandler::FunctionCall> functionCall;
try {
- Excel(xlfVolatile,0,1,TempBool(0));
// initialize Function Call object
functionCall = boost::shared_ptr<ObjHandler::FunctionCall>
! ( new ObjHandler::FunctionCall("ohDependsOn") );
if (functionCall->IsCalledByFuncWiz())
return 0;
--- 66,89 ----
}
! XLL_DEC long *ohTrigger(
! OPER *dummy0,
! OPER *dummy1,
! OPER *dummy2,
! OPER *dummy3,
! OPER *dummy4,
! OPER *dummy5,
! OPER *dummy6,
! OPER *dummy7,
! OPER *dummy8,
! OPER *dummy9) {
!
boost::shared_ptr<ObjHandler::FunctionCall> functionCall;
+
try {
// initialize Function Call object
functionCall = boost::shared_ptr<ObjHandler::FunctionCall>
! ( new ObjHandler::FunctionCall("ohTrigger") );
if (functionCall->IsCalledByFuncWiz())
return 0;
***************
*** 109,115 ****
static long returnValue;
returnValue = iterators[ObjHandler::FunctionCall::instance().getAddressString()]++;
-
- // convert and return the return value
-
return &returnValue;
--- 107,110 ----
***************
*** 120,163 ****
}
- void validateReference2(const XLOPER *xReference, const std::string &name) {
- if (xReference->xltype == xltypeErr && xReference->val.err == xlerrRef) {
- std::ostringstream msg;
- msg << "parameter '" << name << "' is not a valid range reference";
- throw ObjHandler::Exception(msg.str());
- }
- }
-
- XLL_DEC long *ohDependsOn2(
- XLOPER *dummy0,
- XLOPER *dummy1,
- XLOPER *dummy2,
- XLOPER *dummy3,
- XLOPER *dummy4,
- XLOPER *dummy5,
- XLOPER *dummy6,
- XLOPER *dummy7,
- XLOPER *dummy8,
- XLOPER *dummy9) {
- try {
- validateReference2(dummy0, "dummy0");
- validateReference2(dummy1, "dummy1");
- validateReference2(dummy2, "dummy2");
- validateReference2(dummy3, "dummy3");
- validateReference2(dummy4, "dummy4");
- validateReference2(dummy5, "dummy5");
- validateReference2(dummy6, "dummy6");
- validateReference2(dummy7, "dummy7");
- validateReference2(dummy8, "dummy8");
- validateReference2(dummy9, "dummy9");
-
- static long returnValue = 0;
- returnValue++;
- return &returnValue;
- } catch (const std::exception &e) {
- ObjHandler::logMessage(e.what(), 2);
- return 0;
- }
- }
-
XLL_DEC long *ohFunctionCount() {
static long returnValue = FUNCTION_COUNT;
--- 115,118 ----
|
