Menu
▾
▴
[Xlw-cvs] CVS: xlw/xlw macros.h,1.7,1.8 XlfExcel.inl,1.7,1.8 XlfAbstractCmdDesc.cpp,1.5,1.6 XlfArgDesc.cpp,1.6,1.7 XlfCmdDesc.cpp,1.8,1.9 XlfExcel.cpp,1.15,1.16 XlfOper.cpp,1.20,1.21 XlfRef.cpp,1.6,1.7
|
From: jerome l. <jle...@us...> - 2003-10-28 02:48:04
|
Update of /cvsroot/xlw/xlw/xlw
In directory sc8-pr-cvs1:/tmp/cvs-serv17429
Modified Files:
macros.h XlfExcel.inl XlfAbstractCmdDesc.cpp XlfArgDesc.cpp
XlfCmdDesc.cpp XlfExcel.cpp XlfOper.cpp XlfRef.cpp
Log Message:
renamed macro __HERE__ to XLW__HERE__ to avoid conflicts
Index: macros.h
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/macros.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** macros.h 22 Apr 2003 12:41:09 -0000 1.7
--- macros.h 28 Oct 2003 02:47:17 -0000 1.8
***************
*** 1,4 ****
/*
! Copyright (C) 1998, 1999, 2001, 2002, 2003 Jérôme Lecomte
This file is part of XLW, a free-software/open-source C++ wrapper of the
--- 1,4 ----
/*
! Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 Jérôme Lecomte
This file is part of XLW, a free-software/open-source C++ wrapper of the
***************
*** 85,89 ****
*/
! #define __HERE__ __FILE__ "(" _MAKESTRING(__LINE__) "): "
#define _MAKESTRING(a) __MAKESTRING(a)
#define __MAKESTRING(a) #a
--- 85,89 ----
*/
! #define XLW__HERE__ __FILE__ "(" _MAKESTRING(__LINE__) "): "
#define _MAKESTRING(a) __MAKESTRING(a)
#define __MAKESTRING(a) #a
Index: XlfExcel.inl
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfExcel.inl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** XlfExcel.inl 22 Apr 2003 12:41:03 -0000 1.7
--- XlfExcel.inl 28 Oct 2003 02:47:17 -0000 1.8
***************
*** 64,68 ****
offset_=0;
#if !defined(NDEBUG)
! std::cerr << __HERE__ << "xlw is allocating a new buffer of " << size << " bytes" << std::endl;
#endif
return;
--- 64,68 ----
offset_=0;
#if !defined(NDEBUG)
! std::cerr << "xlw is allocating a new buffer of " << size << " bytes" << std::endl;
#endif
return;
Index: XlfAbstractCmdDesc.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfAbstractCmdDesc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** XlfAbstractCmdDesc.cpp 22 Apr 2003 12:40:59 -0000 1.5
--- XlfAbstractCmdDesc.cpp 28 Oct 2003 02:47:17 -0000 1.6
***************
*** 59,63 ****
int err = DoRegister(dllName);
if (err != xlretSuccess)
! std::cerr << __HERE__ << "Error " << err << " while registering " << GetAlias().c_str() << std::endl;
return;
}
--- 59,63 ----
int err = DoRegister(dllName);
if (err != xlretSuccess)
! std::cerr << "Error " << err << " while registering " << GetAlias().c_str() << std::endl;
return;
}
Index: XlfArgDesc.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfArgDesc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** XlfArgDesc.cpp 28 Oct 2003 02:41:30 -0000 1.6
--- XlfArgDesc.cpp 28 Oct 2003 02:47:17 -0000 1.7
***************
*** 33,37 ****
{
if (name_.length() >= 19)
! std::cerr << __HERE__ << "Argument name \"" << name_.c_str()
<< "\" may be too long to fit the in the function wizard" << std::endl;
};
--- 33,37 ----
{
if (name_.length() >= 19)
! std::cerr << XLW__HERE__ << "Argument name \"" << name_.c_str()
<< "\" may be too long to fit the in the function wizard" << std::endl;
};
Index: XlfCmdDesc.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfCmdDesc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** XlfCmdDesc.cpp 22 Apr 2003 12:41:02 -0000 1.8
--- XlfCmdDesc.cpp 28 Oct 2003 02:47:17 -0000 1.9
***************
*** 75,79 ****
int err = XlfExcel::Instance().Call(xlfAddCommand, 0, 3, (LPXLOPER)XlfOper(1.0), (LPXLOPER)XlfOper(menu_.c_str()), (LPXLOPER)&xMenu);
if (err != xlretSuccess)
! std::cerr << __HERE__ << "Add command " << GetName().c_str() << " to " << menu_.c_str() << " failed" << std::endl;
delete[] pxMenu;
return err;
--- 75,79 ----
int err = XlfExcel::Instance().Call(xlfAddCommand, 0, 3, (LPXLOPER)XlfOper(1.0), (LPXLOPER)XlfOper(menu_.c_str()), (LPXLOPER)&xMenu);
if (err != xlretSuccess)
! std::cerr << XLW__HERE__ << "Add command " << GetName().c_str() << " to " << menu_.c_str() << " failed" << std::endl;
delete[] pxMenu;
return err;
***************
*** 84,88 ****
if (menu_.empty())
{
! std::cerr << __HERE__ << "No menu specified for the command \"" << GetName().c_str() << "\"" << std::endl;
return xlretFailed;
}
--- 84,88 ----
if (menu_.empty())
{
! std::cerr << XLW__HERE__ << "No menu specified for the command \"" << GetName().c_str() << "\"" << std::endl;
return xlretFailed;
}
***************
*** 90,94 ****
if (err != xlretSuccess)
{
! std::cerr << __HERE__ << "Registration of " << GetAlias().c_str() << " failed" << std::endl;
return err;
}
--- 90,94 ----
if (err != xlretSuccess)
{
! std::cerr << XLW__HERE__ << "Registration of " << GetAlias().c_str() << " failed" << std::endl;
return err;
}
***************
*** 105,109 ****
if (dllname.empty())
{
! std::cerr << __HERE__ << "Library name is not initialized" << std::endl;
return xlretFailed;
}
--- 105,109 ----
if (dllname.empty())
{
! std::cerr << XLW__HERE__ << "Library name is not initialized" << std::endl;
return xlretFailed;
}
Index: XlfExcel.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfExcel.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** XlfExcel.cpp 22 Apr 2003 12:41:03 -0000 1.15
--- XlfExcel.cpp 28 Oct 2003 02:47:17 -0000 1.16
***************
*** 163,167 ****
int err = Call(xlGetName, (LPXLOPER)xName, 0);
if (err != xlretSuccess)
! std::cerr << __HERE__ << "Could not get DLL name" << std::endl;
else
ret=xName.AsString();
--- 163,167 ----
int err = Call(xlGetName, (LPXLOPER)xName, 0);
if (err != xlretSuccess)
! std::cerr << XLW__HERE__ << "Could not get DLL name" << std::endl;
else
ret=xName.AsString();
***************
*** 220,231 ****
{
if (xlfn & xlCommand)
! std::cerr << __HERE__ << "xlCommand | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlSpecial)
! std::cerr << __HERE__ << "xlSpecial | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlIntl)
! std::cerr << __HERE__ << "xlIntl | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlPrompt)
! std::cerr << __HERE__ << "xlPrompt | " << (xlfn & 0x0FFF) << std::endl;
! std::cerr << __HERE__ << "0 pointer passed as argument #" << i << std::endl;
}
#endif
--- 220,231 ----
{
if (xlfn & xlCommand)
! std::cerr << XLW__HERE__ << "xlCommand | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlSpecial)
! std::cerr << "xlSpecial | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlIntl)
! std::cerr << "xlIntl | " << (xlfn & 0x0FFF) << std::endl;
if (xlfn & xlPrompt)
! std::cerr << "xlPrompt | " << (xlfn & 0x0FFF) << std::endl;
! std::cerr << "0 pointer passed as argument #" << i << std::endl;
}
#endif
Index: XlfOper.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfOper.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** XlfOper.cpp 28 Oct 2003 02:43:31 -0000 1.20
--- XlfOper.cpp 28 Oct 2003 02:47:17 -0000 1.21
***************
*** 115,119 ****
int err = XlfExcel::Instance().XlfExcel::Instance().Call(xlFree, NULL, 1, (LPXLOPER)lpxloper_);
if (err != xlretSuccess)
! std::cerr << __HERE__ << "Call to xlFree failed" << std::endl;
return;
}
--- 115,119 ----
int err = XlfExcel::Instance().XlfExcel::Instance().Call(xlFree, NULL, 1, (LPXLOPER)lpxloper_);
if (err != xlretSuccess)
! std::cerr << XLW__HERE__ << "Call to xlFree failed" << std::endl;
return;
}
***************
*** 511,515 ****
int n = strlen(value);
if (n >= 256)
! std::cerr << __HERE__ << "String too long is truncated" << std::endl;
// One byte more for NULL terminal char (allow use of strcpy)
// and one for the std::string size (convention used by Excel)
--- 511,515 ----
int n = strlen(value);
if (n >= 256)
! std::cerr << XLW__HERE__ << "String too long is truncated" << std::endl;
// One byte more for NULL terminal char (allow use of strcpy)
// and one for the std::string size (convention used by Excel)
Index: XlfRef.cpp
===================================================================
RCS file: /cvsroot/xlw/xlw/xlw/XlfRef.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** XlfRef.cpp 22 Apr 2003 12:41:08 -0000 1.6
--- XlfRef.cpp 28 Oct 2003 02:47:17 -0000 1.7
***************
*** 44,48 ****
if (rowbegin_ + r > rowend_ || colbegin_ + c > colend_)
{
! std::cerr << __HERE__ << "XlfRef access out of range" << std::endl;
}
#endif
--- 44,48 ----
if (rowbegin_ + r > rowend_ || colbegin_ + c > colend_)
{
! std::cerr << "XlfRef access out of range" << std::endl;
}
#endif
|