Update of /cvsroot/objecthandler/ObjectHandler/ohxl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22247/ohxl
Modified Files:
functioncall.cpp functioncall.hpp
Log Message:
on successful completion of function, delete any error message associated with the calling cell
Index: functioncall.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functioncall.cpp 18 Sep 2006 11:20:37 -0000 1.10
--- functioncall.cpp 30 Oct 2006 15:46:51 -0000 1.11
***************
*** 17,21 ****
*/
! #include <oh/objecthandler.hpp>
#include <oh/exception.hpp>
#include <ohxl/functioncall.hpp>
--- 17,21 ----
*/
! #include <ohxl/objecthandlerxl.hpp>
#include <oh/exception.hpp>
#include <ohxl/functioncall.hpp>
***************
*** 30,34 ****
FunctionCall::FunctionCall(const std::string functionName)
: functionName_(functionName), callerDimensions_(Uninitialized),
! callerType_(Uninitialized2){
if (instance_)
throw Exception("Multiple attempts to initialize global FunctionCall object");
--- 30,34 ----
FunctionCall::FunctionCall(const std::string functionName)
: functionName_(functionName), callerDimensions_(Uninitialized),
! callerType_(Uninitialized2), error_(false) {
if (instance_)
throw Exception("Multiple attempts to initialize global FunctionCall object");
***************
*** 41,44 ****
--- 41,46 ----
FunctionCall::~FunctionCall() {
+ if (!error_)
+ ObjectHandlerXL::instance().clearError();
instance_ = 0;
if (xCaller_.xltype) Excel(xlFree, 0, 1, &xCaller_);
Index: functioncall.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/functioncall.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** functioncall.hpp 18 Sep 2006 11:20:37 -0000 1.7
--- functioncall.hpp 30 Oct 2006 15:46:51 -0000 1.8
***************
*** 55,58 ****
--- 55,61 ----
CallerType getCallerType();
bool IsCalledByFuncWiz();
+ void setError() {
+ error_ = true;
+ }
private:
static FunctionCall *instance_;
***************
*** 65,68 ****
--- 68,72 ----
CallerDimensions callerDimensions_;
CallerType callerType_;
+ bool error_;
};
|
