|
From: Eric E. <eri...@us...> - 2006-07-29 15:35:47
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31286/Addins/Calc Modified Files: .cvsignore AddinCalc.vcproj AddinCalc_vc8.vcproj Makefile.vc.debug.crtdll qladdin.cpp Added Files: QuantLibAddinCalc.def conversions.cpp conversions.hpp Removed Files: QLA-Calc.def Log Message: support for Calc Index: .cvsignore =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 May 2006 16:56:16 -0000 1.1 --- .cvsignore 29 Jul 2006 15:32:31 -0000 1.2 *************** *** 1,46 **** AddinCalc.plg autogen.hpp ! qla_all.hpp ! basic.*pp ! date.*pp ! calendar.*pp ! daycounter.*pp ! mathf.*pp ! prices.*pp build capfloor.*pp com couponvectors.*pp ! Debug ! .deps dll exercise.*pp ! *.flag* funcdef.cpp ! instruments.* interpolation.*pp libQuantLibAddinCalc.la - .libs - *.lo Makefile Makefile.in ! objecthandler.hpp ! ohfunctions.* ! options.* processes.*pp QuantLibAddin*.exp - QLA-Calc.idl QuantLibAddin*.lib - *.rdb randomsequencegenerator.*pp schedule.*pp shortratemodels.*pp - simpleswap.*pp swap.*pp termstructures.*pp ! *.urd ! *.user ! utilities.* volatilities.*pp xibor.*pp ! --- 1,54 ---- + *.flag* + *.lo + *.rdb + *.urd + *.user + .deps + .libs AddinCalc.plg autogen.hpp ! bonds.*pp build + calendar.*pp capfloor.*pp + capletvolstructure.*pp com couponvectors.*pp ! date.*pp ! daycounter.*pp dll exercise.*pp ! forwardrateagreement.*pp funcdef.cpp ! index.*pp ! instruments.*pp interpolation.*pp libQuantLibAddinCalc.la Makefile Makefile.in ! mathf.*pp ! optimization.*pp ! options.*pp ! payoffs.*pp ! prices.*pp ! pricingengines.*pp processes.*pp + QuantLibAddinCalc.idl + qla_all.hpp QuantLibAddin*.exp QuantLibAddin*.lib randomsequencegenerator.*pp + ratehelpers.*pp schedule.*pp shortratemodels.*pp swap.*pp + swaption.*pp + swaptionvolstructure.*pp termstructures.*pp ! utilities.*pp ! vanillaswap.*pp volatilities.*pp xibor.*pp ! *.dll ! *.ilk ! Debug\ CRTDLL \ No newline at end of file --- NEW FILE: conversions.hpp --- /* Copyright (C) 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library for financial quantitative analysts and developers - http://quantlib.org/ QuantLib is free software: you can redistribute it and/or modify it under the terms of the QuantLib license. You should have received a copy of the license along with this program; if not, please email qua...@li... The license is also available online at http://quantlib.org/html/license.html This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the license for more details. */ #ifndef qla_calc_conversions_hpp #define qla_calc_conversions_hpp #include <ql/date.hpp> #include <sal/types.h> QuantLib::Date calcToLib(const sal_Int32&); #endif --- QLA-Calc.def DELETED --- Index: Makefile.vc.debug.crtdll =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/Makefile.vc.debug.crtdll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.vc.debug.crtdll 19 May 2006 16:56:16 -0000 1.1 --- Makefile.vc.debug.crtdll 29 Jul 2006 15:32:31 -0000 1.2 *************** *** 2,7 **** DLL_NAME=$(COMPONENT_NAME)-vc71-mt-gd-0_3_12 - LOG4X_NAME=log4cxxs-vc71-mt-gd.lib - DLL_DIR=dll INT_DIR=build\vc71\DebugCRTDLL --- 2,5 ---- *************** *** 23,27 **** CC_INCLUDES=-I. -I..\.. -I"$(QL_DIR)" -I"$(OBJECT_HANDLER_DIR)" \ ! -I"$(OFFICE_SDK_PATH)\include" CC_DEFINES=/DWIN32 /D_DEBUG /DWINDOWS /D_MBCS /D_USRDLL /DWNT --- 21,25 ---- CC_INCLUDES=-I. -I..\.. -I"$(QL_DIR)" -I"$(OBJECT_HANDLER_DIR)" \ ! -I"$(LOG4CXX_DIR)/include" -I"$(OFFICE_SDK_PATH)\include" CC_DEFINES=/DWIN32 /D_DEBUG /DWINDOWS /D_MBCS /D_USRDLL /DWNT *************** *** 31,56 **** OBJECTS= \ "$(INT_DIR)\calcutils.obj" \ ! "$(INT_DIR)\calendar.obj" \ ! "$(INT_DIR)\date.obj" \ ! "$(INT_DIR)\daycounter.obj" \ ! "$(INT_DIR)\capfloor.obj" \ ! "$(INT_DIR)\couponvectors.obj" \ "$(INT_DIR)\funcdef.obj" \ - "$(INT_DIR)\instruments.obj" \ - "$(INT_DIR)\interpolation.obj" \ - "$(INT_DIR)\ohfunctions.obj" \ "$(INT_DIR)\options.obj" \ ! "$(INT_DIR)\prices.obj" \ "$(INT_DIR)\processes.obj" \ "$(INT_DIR)\qladdin.obj" \ - "$(INT_DIR)\schedule.obj" \ "$(INT_DIR)\session.obj" \ ! "$(INT_DIR)\shortratemodels.obj" \ ! "$(INT_DIR)\simpleswap.obj" \ ! "$(INT_DIR)\swap.obj" \ ! "$(INT_DIR)\termstructures.obj" \ ! "$(INT_DIR)\utilities.obj" \ ! "$(INT_DIR)\volatilities.obj" \ ! "$(INT_DIR)\xibor.obj" LFLAGS=msvcrtd.lib msvcprtd.lib kernel32.lib wsock32.lib \ --- 29,42 ---- OBJECTS= \ "$(INT_DIR)\calcutils.obj" \ ! "$(INT_DIR)\conversions.obj" \ ! "$(INT_DIR)\exercise.obj" \ "$(INT_DIR)\funcdef.obj" \ "$(INT_DIR)\options.obj" \ ! "$(INT_DIR)\payoffs.obj" \ ! "$(INT_DIR)\pricingengines.obj" \ "$(INT_DIR)\processes.obj" \ "$(INT_DIR)\qladdin.obj" \ "$(INT_DIR)\session.obj" \ ! "$(INT_DIR)\volatilities.obj" LFLAGS=msvcrtd.lib msvcprtd.lib kernel32.lib wsock32.lib \ *************** *** 58,73 **** comctl32.lib user32.lib winspool.lib shell32.lib ole32.lib \ oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ! icppu.lib icppuhelper.lib isal.lib $(LOG4X_NAME) \ /nologo /dll /pdb:$(INT_DIR)\$(COMPONENT_NAME).pdb /debug /machine:I386 \ /def:.\$(COMPONENT_NAME).def /out:$(DLL_FILE) \ /pdbtype:sept /libpath:. /libpath:..\..\lib /libpath:"$(OFFICE_SDK_PATH)\windows\lib" \ /libpath:"$(QL_DIR)\lib" /libpath:"$(OBJECT_HANDLER_DIR)\lib" \ ! /libpath:"$(LOG4CXX_DIR)\msvc\Lib" ! ! !IF "$(OS)" == "Windows_NT" ! NULL= ! !ELSE ! NULL=nul ! !ENDIF TYPES = -Tcom.sun.star.sheet.XAddIn \ --- 44,53 ---- comctl32.lib user32.lib winspool.lib shell32.lib ole32.lib \ oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ! icppu.lib icppuhelper.lib isal.lib \ /nologo /dll /pdb:$(INT_DIR)\$(COMPONENT_NAME).pdb /debug /machine:I386 \ /def:.\$(COMPONENT_NAME).def /out:$(DLL_FILE) \ /pdbtype:sept /libpath:. /libpath:..\..\lib /libpath:"$(OFFICE_SDK_PATH)\windows\lib" \ /libpath:"$(QL_DIR)\lib" /libpath:"$(OBJECT_HANDLER_DIR)\lib" \ ! /libpath:"$(LOG4CXX_DIR)\msvc\lib" TYPES = -Tcom.sun.star.sheet.XAddIn \ *************** *** 85,102 **** ALL : $(FLAG6) ! ! # this copy gets around problems with spaces in pathnames $(URD_FILE) : $(COMPONENT_NAME).idl ! copy $(COMPONENT_NAME).idl $(TEMP) ! idlc -I$(IDL_DIR) "$(TEMP)\$(COMPONENT_NAME).idl" "$(INT_DIR)" : ! if not exist "$(INT_DIR)/$(NULL)" mkdir "$(INT_DIR)" "$(DLL_DIR)" : ! if not exist "$(DLL_DIR)/$(NULL)" mkdir "$(DLL_DIR)" $(FLAG1) : $(URD_FILE) $(INT_DIR) ! regmerge $(RDB_FILE) /UCR "$(TEMP)\$(URD_FILE)" echo flagged > $@ --- 65,80 ---- ALL : $(FLAG6) ! $(URD_FILE) : $(COMPONENT_NAME).idl ! idlc -I$(IDL_DIR) $(COMPONENT_NAME).idl "$(INT_DIR)" : ! if not exist "$(INT_DIR)" mkdir "$(INT_DIR)" "$(DLL_DIR)" : ! if not exist "$(DLL_DIR)" mkdir "$(DLL_DIR)" $(FLAG1) : $(URD_FILE) $(INT_DIR) ! regmerge $(RDB_FILE) /UCR $(URD_FILE) echo flagged > $@ *************** *** 130,134 **** -@ if EXIST "$(INT_DIR)\*" del /f /q "$(INT_DIR)\*" -@ if EXIST "$(DLL_DIR)\*" del /f /q "$(DLL_DIR)\*" ! -@ if EXIST "$(TEMP)\$(URD_FILE)" del /f /q "$(TEMP)\$(URD_FILE)" -@ if EXIST com rmdir /q /s com --- 108,112 ---- -@ if EXIST "$(INT_DIR)\*" del /f /q "$(INT_DIR)\*" -@ if EXIST "$(DLL_DIR)\*" del /f /q "$(DLL_DIR)\*" ! -@ if EXIST "$(URD_FILE)" del /f /q "$(URD_FILE)" -@ if EXIST com rmdir /q /s com Index: AddinCalc.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AddinCalc.vcproj 11 Jun 2006 13:39:19 -0000 1.2 --- AddinCalc.vcproj 29 Jul 2006 15:32:31 -0000 1.3 *************** *** 14,19 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory=".\build\vc71\$(ConfigurationName)" ! IntermediateDirectory=".\build\vc71\$(ConfigurationName)" ConfigurationType="0" UseOfMFC="0" --- 14,33 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="0" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE"> ! <Tool ! Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ! ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" ! CleanCommandLine="nmake /f "Makefile.vc.debug.crtdll" clean" ! Output="AddinCalc.exe"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="0" UseOfMFC="0" *************** *** 23,26 **** --- 37,41 ---- BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" + CleanCommandLine="nmake /f "Makefile.vc.debug.crtdll" clean" Output="AddinCalc.exe"/> </Configuration> *************** *** 33,115 **** Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File ! RelativePath="calcutils.cpp"> ! </File> ! <File ! RelativePath=".\calendar.cpp"> ! </File> ! <File ! RelativePath="capfloor.cpp"> ! </File> ! <File ! RelativePath="couponvectors.cpp"> ! </File> ! <File ! RelativePath="date.cpp"> ! </File> ! <File ! RelativePath=".\daycounter.cpp"> ! </File> ! <File ! RelativePath="exercise.cpp"> ! </File> ! <File ! RelativePath="funcdef.cpp"> ! </File> ! <File ! RelativePath="instruments.cpp"> ! </File> ! <File ! RelativePath="interpolation.cpp"> ! </File> ! <File ! RelativePath="mathf.cpp"> ! </File> ! <File ! RelativePath="ohfunctions.cpp"> ! </File> ! <File ! RelativePath="options.cpp"> ! </File> ! <File ! RelativePath="prices.cpp"> ! </File> ! <File ! RelativePath="processes.cpp"> ! </File> ! <File ! RelativePath="QLA-Calc.idl"> ! </File> ! <File ! RelativePath="qladdin.cpp"> </File> <File ! RelativePath="randomsequencegenerator.cpp"> </File> <File ! RelativePath="schedule.cpp"> </File> <File ! RelativePath="session.cpp"> </File> <File ! RelativePath="shortratemodels.cpp"> </File> <File ! RelativePath="simpleswap.cpp"> </File> <File ! RelativePath="swap.cpp"> </File> <File ! RelativePath="termstructures.cpp"> </File> <File ! RelativePath="utilities.cpp"> </File> <File ! RelativePath="volatilities.cpp"> </File> <File ! RelativePath="xibor.cpp"> </File> </Filter> --- 48,82 ---- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File ! RelativePath=".\calcutils.cpp"> </File> <File ! RelativePath=".\conversions.cpp"> </File> <File ! RelativePath=".\exercise.cpp"> </File> <File ! RelativePath=".\funcdef.cpp"> </File> <File ! RelativePath=".\options.cpp"> </File> <File ! RelativePath=".\payoffs.cpp"> </File> <File ! RelativePath=".\pricingengines.cpp"> </File> <File ! RelativePath=".\processes.cpp"> </File> <File ! RelativePath=".\qladdin.cpp"> </File> <File ! RelativePath=".\session.cpp"> </File> <File ! RelativePath=".\volatilities.cpp"> </File> </Filter> *************** *** 118,197 **** Filter="h;hpp;hxx;hm;inl"> <File ! RelativePath="calcutils.hpp"> ! </File> ! <File ! RelativePath=".\calendar.hpp"> ! </File> ! <File ! RelativePath="capfloor.hpp"> ! </File> ! <File ! RelativePath="couponvectors.hpp"> ! </File> ! <File ! RelativePath="date.hpp"> ! </File> ! <File ! RelativePath=".\daycounter.hpp"> ! </File> ! <File ! RelativePath="exercise.hpp"> ! </File> ! <File ! RelativePath="instruments.hpp"> ! </File> ! <File ! RelativePath="interpolation.hpp"> ! </File> ! <File ! RelativePath="mathf.hpp"> ! </File> ! <File ! RelativePath="ohfunctions.hpp"> ! </File> ! <File ! RelativePath="options.hpp"> ! </File> ! <File ! RelativePath="prices.hpp"> ! </File> ! <File ! RelativePath="processes.hpp"> ! </File> ! <File ! RelativePath="qla_all.hpp"> ! </File> ! <File ! RelativePath="qladdin.hpp"> </File> <File ! RelativePath="qldefs.hpp"> </File> <File ! RelativePath="randomsequencegenerator.hpp"> </File> <File ! RelativePath="schedule.hpp"> </File> <File ! RelativePath="shortratemodels.hpp"> </File> <File ! RelativePath="simpleswap.hpp"> </File> <File ! RelativePath="swap.hpp"> </File> <File ! RelativePath="termstructures.hpp"> </File> <File ! RelativePath="utilities.hpp"> </File> <File ! RelativePath="volatilities.hpp"> </File> <File ! RelativePath="xibor.hpp"> </File> </Filter> --- 85,119 ---- Filter="h;hpp;hxx;hm;inl"> <File ! RelativePath=".\calcutils.hpp"> </File> <File ! RelativePath=".\conversions.hpp"> </File> <File ! RelativePath=".\exercise.hpp"> </File> <File ! RelativePath=".\options.hpp"> </File> <File ! RelativePath=".\payoffs.hpp"> </File> <File ! RelativePath=".\pricingengines.hpp"> </File> <File ! RelativePath=".\processes.hpp"> </File> <File ! RelativePath=".\qla_all.hpp"> </File> <File ! RelativePath=".\qladdin.hpp"> </File> <File ! RelativePath=".\qldefs.hpp"> </File> <File ! RelativePath=".\volatilities.hpp"> </File> </Filter> *************** *** 203,206 **** --- 125,131 ---- RelativePath="Makefile.vc.debug.crtdll"> </File> + <File + RelativePath=".\QuantLibAddinCalc.idl"> + </File> </Files> <Globals> --- NEW FILE: conversions.cpp --- /* Copyright (C) 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library for financial quantitative analysts and developers - http://quantlib.org/ QuantLib is free software: you can redistribute it and/or modify it under the terms of the QuantLib license. You should have received a copy of the license along with this program; if not, please email qua...@li... The license is also available online at http://quantlib.org/html/license.html This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the license for more details. */ #include <Addins/Calc/conversions.hpp> QuantLib::Date calcToLib(const sal_Int32 &date) { return QuantLib::Date(date); } Index: AddinCalc_vc8.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc_vc8.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AddinCalc_vc8.vcproj 11 Jun 2006 18:16:49 -0000 1.2 --- AddinCalc_vc8.vcproj 29 Jul 2006 15:32:31 -0000 1.3 *************** *** 47,155 **** > <File ! RelativePath="calcutils.cpp" ! > ! </File> ! <File ! RelativePath=".\calendar.cpp" ! > ! </File> ! <File ! RelativePath="capfloor.cpp" ! > ! </File> ! <File ! RelativePath="couponvectors.cpp" ! > ! </File> ! <File ! RelativePath="date.cpp" ! > ! </File> ! <File ! RelativePath=".\daycounter.cpp" ! > ! </File> ! <File ! RelativePath="exercise.cpp" ! > ! </File> ! <File ! RelativePath="funcdef.cpp" ! > ! </File> ! <File ! RelativePath="instruments.cpp" ! > ! </File> ! <File ! RelativePath="interpolation.cpp" ! > ! </File> ! <File ! RelativePath="mathf.cpp" ! > ! </File> ! <File ! RelativePath="ohfunctions.cpp" ! > ! </File> ! <File ! RelativePath="options.cpp" ! > ! </File> ! <File ! RelativePath="prices.cpp" ! > ! </File> ! <File ! RelativePath="processes.cpp" ! > ! </File> ! <File ! RelativePath="QLA-Calc.idl" ! > ! </File> ! <File ! RelativePath="qladdin.cpp" ! > ! </File> ! <File ! RelativePath="randomsequencegenerator.cpp" > </File> <File ! RelativePath="schedule.cpp" > </File> <File ! RelativePath="session.cpp" > </File> <File ! RelativePath="shortratemodels.cpp" > </File> <File ! RelativePath="simpleswap.cpp" > </File> <File ! RelativePath="swap.cpp" > </File> <File ! RelativePath="termstructures.cpp" > </File> <File ! RelativePath="utilities.cpp" > </File> <File ! RelativePath="volatilities.cpp" > </File> <File ! RelativePath="xibor.cpp" > </File> --- 47,87 ---- > <File ! RelativePath=".\calcutils.cpp" > </File> <File ! RelativePath=".\exercise.cpp" > </File> <File ! RelativePath=".\funcdef.cpp" > </File> <File ! RelativePath=".\options.cpp" > </File> <File ! RelativePath=".\payoffs.cpp" > </File> <File ! RelativePath=".\pricingengines.cpp" > </File> <File ! RelativePath=".\processes.cpp" > </File> <File ! RelativePath=".\qladdin.cpp" > </File> <File ! RelativePath=".\session.cpp" > </File> <File ! RelativePath=".\volatilities.cpp" > </File> *************** *** 160,264 **** > <File ! RelativePath="calcutils.hpp" ! > ! </File> ! <File ! RelativePath=".\calendar.hpp" ! > ! </File> ! <File ! RelativePath="capfloor.hpp" ! > ! </File> ! <File ! RelativePath="couponvectors.hpp" ! > ! </File> ! <File ! RelativePath="date.hpp" ! > ! </File> ! <File ! RelativePath=".\daycounter.hpp" ! > ! </File> ! <File ! RelativePath="exercise.hpp" ! > ! </File> ! <File ! RelativePath="instruments.hpp" ! > ! </File> ! <File ! RelativePath="interpolation.hpp" ! > ! </File> ! <File ! RelativePath="mathf.hpp" ! > ! </File> ! <File ! RelativePath="ohfunctions.hpp" ! > ! </File> ! <File ! RelativePath="options.hpp" ! > ! </File> ! <File ! RelativePath="prices.hpp" ! > ! </File> ! <File ! RelativePath="processes.hpp" ! > ! </File> ! <File ! RelativePath="qla_all.hpp" ! > ! </File> ! <File ! RelativePath="qladdin.hpp" ! > ! </File> ! <File ! RelativePath="qldefs.hpp" > </File> <File ! RelativePath="randomsequencegenerator.hpp" > </File> <File ! RelativePath="schedule.hpp" > </File> <File ! RelativePath="shortratemodels.hpp" > </File> <File ! RelativePath="simpleswap.hpp" > </File> <File ! RelativePath="swap.hpp" > </File> <File ! RelativePath="termstructures.hpp" > </File> <File ! RelativePath="utilities.hpp" > </File> <File ! RelativePath="volatilities.hpp" > </File> <File ! RelativePath="xibor.hpp" > </File> --- 92,132 ---- > <File ! RelativePath=".\calcutils.hpp" > </File> <File ! RelativePath=".\exercise.hpp" > </File> <File ! RelativePath=".\options.hpp" > </File> <File ! RelativePath=".\payoffs.hpp" > </File> <File ! RelativePath=".\pricingengines.hpp" > </File> <File ! RelativePath=".\processes.hpp" > </File> <File ! RelativePath=".\qla_all.hpp" > </File> <File ! RelativePath=".\qladdin.hpp" > </File> <File ! RelativePath=".\qldefs.hpp" > </File> <File ! RelativePath=".\volatilities.hpp" > </File> *************** *** 268,271 **** --- 136,143 ---- > </File> + <File + RelativePath=".\QuantLibAddinCalc.idl" + > + </File> </Files> <Globals> --- NEW FILE: QuantLibAddinCalc.def --- EXPORTS component_getImplementationEnvironment component_writeInfo component_getFactory Index: qladdin.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/qladdin.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** qladdin.cpp 19 May 2006 16:56:16 -0000 1.1 --- qladdin.cpp 29 Jul 2006 15:32:31 -0000 1.2 *************** *** 17,22 **** #ifdef WIN32 - #pragma warning(disable: 4786) #pragma warning(disable: 4503) #endif --- 17,23 ---- #ifdef WIN32 #pragma warning(disable: 4503) + #pragma warning(disable: 4786) + #pragma warning(disable: 4800) #endif *************** *** 27,30 **** --- 28,44 ---- #include <osl/mutex.hxx> #include <rtl/uuid.h> + + #include <oh/objhandlerdefines.hpp> + + #ifdef BOOST_MSVC + # define BOOST_LIB_DIAGNOSTIC + # include <ql/qldefines.hpp> + # include <ql/auto_link.hpp> + # include <oh/auto_link.hpp> + # include <qlo/qladdindefines.hpp> + # include <qlo/auto_link.hpp> + # include <log4cxx/auto_link.hpp> + # undef BOOST_LIB_DIAGNOSTIC + #endif #define ADDIN_SERVICE "com.sun.star.sheet.AddIn" |
