|
From: Eric E. <eri...@us...> - 2006-08-28 10:05:57
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144/Addins/Calc Modified Files: AddinCalc.vcproj AddinCalc_vc8.vcproj Makefile.am calcutils.hpp conversions.cpp conversions.hpp qladdin.cpp Added Files: Makefile.vc Removed Files: Makefile.vc.debug.crtdll Log Message: merge R000313f0-branch Index: conversions.hpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/conversions.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** conversions.hpp 29 Jul 2006 15:32:31 -0000 1.1 --- conversions.hpp 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 20,26 **** #include <ql/date.hpp> #include <sal/types.h> ! QuantLib::Date calcToLib(const sal_Int32&); #endif --- 20,45 ---- #include <ql/date.hpp> + #include <ql/calendar.hpp> + #include <ql/Math/matrix.hpp> + #include <Addins/Calc/qldefs.hpp> #include <sal/types.h> + #include <vector> ! void calcToLib(QuantLib::Date &, const sal_Int32&); ! void calcToLib(QuantLib::Calendar &, const STRING &id); ! void calcToLib(QuantLib::Period &, const STRING &id); ! void calcToVectorLib(std::vector<QuantLib::Date> &, const SEQSEQ(sal_Int32) &); ! void calcToVectorLib(QuantLib::Array &, const SEQSEQ(double) &); ! void calcToVectorLib(std::vector<std::string> &, const SEQSEQ(ANY) &); ! void calcToVectorLib(std::vector<long> &, const SEQSEQ(sal_Int32) &); ! void calcToVectorLib(std::vector<bool> &, const SEQSEQ(sal_Int32) &); ! void calcToVectorLib(std::vector<QuantLib::Period> &, const SEQSEQ(ANY) &); ! QuantLib::Matrix calcToQlMatrix(const SEQSEQ(double) &); ! ! void scalarToCalcLib(sal_Int32 &, const QuantLib::Date &); ! void scalarToCalcLib(double &, const QuantLib::Real &); ! void vectorToCalcLib(SEQSEQ(sal_Int32) &, const std::vector<QuantLib::Date> &); ! void vectorToCalcLib(SEQSEQ(double) &, const QuantLib::Array &); ! void matrixToCalcLib(SEQSEQ(double) &, const QuantLib::Matrix &); #endif --- Makefile.vc.debug.crtdll DELETED --- Index: AddinCalc.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AddinCalc.vcproj 29 Jul 2006 15:32:31 -0000 1.3 --- AddinCalc.vcproj 28 Aug 2006 10:05:22 -0000 1.4 *************** *** 13,31 **** <Configurations> <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)" --- 13,17 ---- <Configurations> <Configuration ! Name="Release CRTDLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 35,42 **** <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> </Configurations> --- 21,27 ---- <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc"" ! ReBuildCommandLine="nmake /f "Makefile.vc" /a" ! CleanCommandLine="nmake /f "Makefile.vc" clean"/> </Configuration> </Configurations> *************** *** 78,81 **** --- 63,69 ---- </File> <File + RelativePath=".\utilities.cpp"> + </File> + <File RelativePath=".\volatilities.cpp"> </File> *************** *** 115,118 **** --- 103,109 ---- </File> <File + RelativePath=".\utilities.hpp"> + </File> + <File RelativePath=".\volatilities.hpp"> </File> *************** *** 123,127 **** </Filter> <File ! RelativePath="Makefile.vc.debug.crtdll"> </File> <File --- 114,118 ---- </Filter> <File ! RelativePath="Makefile.vc"> </File> <File Index: calcutils.hpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/calcutils.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calcutils.hpp 19 May 2006 16:56:16 -0000 1.1 --- calcutils.hpp 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 19,22 **** --- 19,24 ---- #define qla_calc_calcutils_hpp + #include <boost/any.hpp> + std::string ouStringToStlString(const STRING &s); ANY stlStringToCalcAny(const std::string &s); Index: conversions.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/conversions.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** conversions.cpp 29 Jul 2006 15:32:31 -0000 1.1 --- conversions.cpp 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 17,24 **** #include <Addins/Calc/conversions.hpp> - QuantLib::Date calcToLib(const sal_Int32 &date) { - return QuantLib::Date(date); } --- 17,119 ---- #include <Addins/Calc/conversions.hpp> + #include <Addins/Calc/calcutils.hpp> + #include <qlo/calendar.hpp> + #include <qlo/typefactory.hpp> + #include <oh/objecthandler.hpp> + + void calcToLib(QuantLib::Date &ret, const sal_Int32 &date) { + ret = QuantLib::Date(date); + } + + void calcToLib(QuantLib::Calendar &ret, const STRING &id2) { + std::string id = ouStringToStlString(id2); + if (QuantLibAddin::Create<QuantLib::Calendar>().checkType(id)) { + ret = QuantLibAddin::Create<QuantLib::Calendar>()(id); + } else { + OH_GET_REFERENCE(calendarPointer, id, + QuantLibAddin::JointCalendar, QuantLib::Calendar) + ret = *calendarPointer.get(); + } + } + + void calcToLib(QuantLib::Period &ret, const STRING &id) { + } + + void calcToVectorLib(std::vector<QuantLib::Date> &ret, + const SEQSEQ(sal_Int32) &in) { + for (int i=0; i<in.getLength(); i++) + for (int j=0; j<in[i].getLength(); j++) + ret.push_back(QuantLib::Date(in[i][j])); } + void calcToVectorLib(QuantLib::Array &ret, const SEQSEQ(double) &in) { + } + + void calcToVectorLib(std::vector<std::string> &ret, const SEQSEQ(ANY) &in) { + } + + void calcToVectorLib(std::vector<long> &ret, const SEQSEQ(sal_Int32) &in) { + } + + void calcToVectorLib(std::vector<bool> &ret, const SEQSEQ(sal_Int32) &in) { + } + + void calcToVectorLib(std::vector<QuantLib::Period> &ret, const SEQSEQ(ANY) &in) { + } + + QuantLib::Matrix calcToQlMatrix(const SEQSEQ(double) &in) { + int rows = in.getLength(); + int cols; + if (rows) + cols = in[0].getLength(); + else + cols = 0; + QuantLib::Matrix m(rows, cols); + for (int i=0; i<rows; i++) { + SEQ(double) row = in[i]; + for (int j=0; j<cols; j++) { + m[i][j] = row[j]; + } + } + return m; + } + + + void scalarToCalcLib(sal_Int32 &ret, const QuantLib::Date &in) { + ret = in.serialNumber(); + } + + void scalarToCalcLib(double &ret, const QuantLib::Real &in) { + ret = in; + } + + void vectorToCalcLib(SEQSEQ(sal_Int32) &ret, const std::vector<QuantLib::Date> &v) { + ret.realloc(v.size()); + for (unsigned int i=0; i<v.size(); i++) { + SEQ(sal_Int32) s(1); + s[0] = v[i].serialNumber(); + ret[i] = s; + } + } + + void vectorToCalcLib(SEQSEQ(double) &ret, const QuantLib::Array &in) { + ret.realloc(in.size()); + for (unsigned int i=0; i<in.size(); i++) { + SEQ(double) s(1); + s[0] = in[i]; + ret[i] = s; + } + } + + void matrixToCalcLib(SEQSEQ(double) &ret, const QuantLib::Matrix &in) { + ret.realloc(in.rows()); + for (unsigned int i=0; i<in.rows(); i++) { + SEQ(double) s(in.columns()); + for (unsigned int j=0; j<in.columns(); j++) { + s[j] = in[i][j]; + } + ret[i] = s; + } + } Index: Makefile.am =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 19 May 2006 16:56:16 -0000 1.1 --- Makefile.am 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 3,7 **** -DUNX -DGCC -DLINUX -DCPPU_ENV=gcc3 ! COMPONENT_NAME=QLA-Calc IDL_DIR=$(OFFICE_SDK_PATH)/idl DKREGISTRYNAME=$(OFFICE_PROGRAM_PATH)/types.rdb --- 3,7 ---- -DUNX -DGCC -DLINUX -DCPPU_ENV=gcc3 ! COMPONENT_NAME=QuantLibAddinCalc IDL_DIR=$(OFFICE_SDK_PATH)/idl DKREGISTRYNAME=$(OFFICE_PROGRAM_PATH)/types.rdb *************** *** 13,17 **** endif ! libQuantLibAddinCalc_la_LIBADD = ../../qla/libQuantLibAddin.la libQuantLibAddinCalc_la_LDFLAGS = \ --- 13,17 ---- endif ! libQuantLibAddinCalc_la_LIBADD = ../../qlo/libQuantLibAddin.la libQuantLibAddinCalc_la_LDFLAGS = \ *************** *** 52,78 **** EXTRA_DIST = \ - AddinCalc.dsp \ AddinCalc.vcproj \ AddinCalc_vc8.vcproj \ ! Makefile.vc.debug.crtdll \ ! QuantLibAddin.def \ ! QuantLibAddin.idl \ readme.txt if BUILD_CALC noinst_HEADERS = \ calcutils.hpp \ calendar.hpp \ capfloor.hpp \ couponvectors.hpp \ date.hpp \ - daycounter.hpp \ exercise.hpp \ instruments.hpp \ interpolation.hpp \ mathf.hpp \ ! ohfunctions.hpp \ options.hpp \ prices.hpp \ processes.hpp \ qla_all.hpp \ --- 52,82 ---- EXTRA_DIST = \ AddinCalc.vcproj \ AddinCalc_vc8.vcproj \ ! Makefile.vc \ ! QuantLibAddinCalc.def \ ! QuantLibAddinCalc.idl \ readme.txt if BUILD_CALC noinst_HEADERS = \ + bonds.hpp \ calcutils.hpp \ calendar.hpp \ capfloor.hpp \ + capletvolstructure.hpp \ + conversions.hpp \ couponvectors.hpp \ date.hpp \ exercise.hpp \ + forwardrateagreement.hpp \ instruments.hpp \ interpolation.hpp \ mathf.hpp \ ! optimization.hpp \ options.hpp \ + payoffs.hpp \ prices.hpp \ + pricingengines.hpp \ processes.hpp \ qla_all.hpp \ *************** *** 80,120 **** qldefs.hpp \ randomsequencegenerator.hpp \ schedule.hpp \ shortratemodels.hpp \ - simpleswap.hpp \ swap.hpp \ termstructures.hpp \ utilities.hpp \ ! volatilities.hpp \ ! xibor.hpp endif libQuantLibAddinCalc_la_SOURCES = \ calcutils.cpp \ calendar.cpp \ capfloor.cpp \ couponvectors.cpp \ date.cpp \ - daycounter.cpp \ exercise.cpp \ funcdef.cpp \ instruments.cpp \ interpolation.cpp \ mathf.cpp \ ! ohfunctions.cpp \ options.cpp \ prices.cpp \ processes.cpp \ qladdin.cpp \ randomsequencegenerator.cpp \ schedule.cpp \ session.cpp \ shortratemodels.cpp \ - simpleswap.cpp \ swap.cpp \ termstructures.cpp \ utilities.cpp \ ! volatilities.cpp \ ! xibor.cpp if BUILD_CALC --- 84,133 ---- qldefs.hpp \ randomsequencegenerator.hpp \ + ratehelpers.hpp \ schedule.hpp \ shortratemodels.hpp \ swap.hpp \ + swaption.hpp \ + swaptionvolstructure.hpp \ termstructures.hpp \ utilities.hpp \ ! vanillaswap.hpp \ ! volatilities.hpp endif libQuantLibAddinCalc_la_SOURCES = \ + bonds.cpp \ calcutils.cpp \ calendar.cpp \ capfloor.cpp \ + capletvolstructure.cpp \ + conversions.cpp \ couponvectors.cpp \ date.cpp \ exercise.cpp \ + forwardrateagreement.cpp \ funcdef.cpp \ instruments.cpp \ interpolation.cpp \ mathf.cpp \ ! optimization.cpp \ options.cpp \ + payoffs.cpp \ prices.cpp \ + pricingengines.cpp \ processes.cpp \ qladdin.cpp \ randomsequencegenerator.cpp \ + ratehelpers.cpp \ schedule.cpp \ session.cpp \ shortratemodels.cpp \ swap.cpp \ + swaption.cpp \ + swaptionvolstructure.cpp \ termstructures.cpp \ utilities.cpp \ ! vanillaswap.cpp \ ! volatilities.cpp if BUILD_CALC Index: AddinCalc_vc8.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc_vc8.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AddinCalc_vc8.vcproj 29 Jul 2006 15:32:31 -0000 1.3 --- AddinCalc_vc8.vcproj 28 Aug 2006 10:05:22 -0000 1.4 *************** *** 26,31 **** <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ! ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" CleanCommandLine="" Output="AddinCalc.exe" --- 26,31 ---- <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc"" ! ReBuildCommandLine="nmake /f "Makefile.vc" /a" CleanCommandLine="" Output="AddinCalc.exe" *************** *** 51,54 **** --- 51,58 ---- </File> <File + RelativePath=".\conversions.cpp" + > + </File> + <File RelativePath=".\exercise.cpp" > *************** *** 96,99 **** --- 100,107 ---- </File> <File + RelativePath=".\conversions.hpp" + > + </File> + <File RelativePath=".\exercise.hpp" > *************** *** 133,137 **** </Filter> <File ! RelativePath="Makefile.vc.debug.crtdll" > </File> --- 141,145 ---- </Filter> <File ! RelativePath="Makefile.vc" > </File> --- NEW FILE: Makefile.vc --- # makefile for Calc Addin # this makefile supports only one build environment: # VC7 (Visual Studio 2003), configuration "Release CRTDLL" # for further info: http://www.quantlibaddin.org/calc.html OFFICE_PROGRAM_PATH=C:\Program Files\OpenOffice.org 2.0\program OFFICE_SDK_PATH=C:\OpenOffice.org_2.0_SDK COMPONENT_NAME=QuantLibAddinCalc DLL_NAME=$(COMPONENT_NAME)-vc71-mt-0_3_13 DLL_DIR=dll INT_DIR=build\vc71\DebugCRTDLL IDL_DIR="$(OFFICE_SDK_PATH)\idl" TYP_FILE="$(OFFICE_PROGRAM_PATH)\types.rdb" URD_FILE=$(COMPONENT_NAME).urd RDB_FILE=$(DLL_NAME).rdb DLL_FILE=$(DLL_NAME).dll FLAG1=$(INT_DIR)\$(COMPONENT_NAME).flag1 FLAG2=$(INT_DIR)\$(COMPONENT_NAME).flag2 FLAG3=$(INT_DIR)\$(COMPONENT_NAME).flag3 FLAG4=$(INT_DIR)\$(COMPONENT_NAME).flag4 FLAG5=$(INT_DIR)\$(COMPONENT_NAME).flag5 FLAG6=$(INT_DIR)\$(COMPONENT_NAME).flag6 CC_INCLUDES=-I. -I..\.. \ -I"$(QL_DIR)" -I"$(QL_DIR)\functions" \ -I"$(OBJECT_HANDLER_DIR)" \ -I"$(OFFICE_SDK_PATH)\include" CC_FLAGS=/c /nologo /MD /GX /GR \ /wd4251 /wd4275 /wd4290 /wd4675 /wd4786 /wd4800 \ /DWIN32 /DWNT /DCPPU_ENV=msci /Fo"$(INT_DIR)\\" OBJECTS= \ "$(INT_DIR)\bonds.obj" \ "$(INT_DIR)\calcutils.obj" \ "$(INT_DIR)\calendar.obj" \ "$(INT_DIR)\capfloor.obj" \ "$(INT_DIR)\capletvolstructure.obj" \ "$(INT_DIR)\conversions.obj" \ "$(INT_DIR)\couponvectors.obj" \ "$(INT_DIR)\date.obj" \ "$(INT_DIR)\exercise.obj" \ "$(INT_DIR)\forwardrateagreement.obj" \ "$(INT_DIR)\funcdef.obj" \ "$(INT_DIR)\instruments.obj" \ "$(INT_DIR)\interpolation.obj" \ "$(INT_DIR)\mathf.obj" \ "$(INT_DIR)\optimization.obj" \ "$(INT_DIR)\options.obj" \ "$(INT_DIR)\payoffs.obj" \ "$(INT_DIR)\prices.obj" \ "$(INT_DIR)\pricingengines.obj" \ "$(INT_DIR)\processes.obj" \ "$(INT_DIR)\qladdin.obj" \ "$(INT_DIR)\randomsequencegenerator.obj" \ "$(INT_DIR)\ratehelpers.obj" \ "$(INT_DIR)\schedule.obj" \ "$(INT_DIR)\session.obj" \ "$(INT_DIR)\shortratemodels.obj" \ "$(INT_DIR)\swap.obj" \ "$(INT_DIR)\swaption.obj" \ "$(INT_DIR)\swaptionvolstructure.obj" \ "$(INT_DIR)\termstructures.obj" \ "$(INT_DIR)\utilities.obj" \ "$(INT_DIR)\vanillaswap.obj" \ "$(INT_DIR)\volatilities.obj" LFLAGS=/nologo /dll /out:$(DLL_FILE) \ /def:.\$(COMPONENT_NAME).def \ /libpath:. /libpath:..\..\lib \ /libpath:"$(OFFICE_SDK_PATH)\windows\lib" \ /libpath:"$(QL_DIR)\lib" \ /libpath:"$(OBJECT_HANDLER_DIR)\lib" \ /libpath:"$(LOG4CXX_DIR)\msvc\lib" \ kernel32.lib wsock32.lib advapi32.lib \ oldnames.lib netapi32.lib advapi32.lib gdi32.lib comdlg32.lib \ comctl32.lib user32.lib winspool.lib shell32.lib ole32.lib \ oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ icppuhelper.lib icppu.lib isal.lib \ msvcrt.lib msvcprt.lib TYPES = -Tcom.sun.star.sheet.XAddIn \ -Tcom.sun.star.lang.XServiceName \ -Tcom.sun.star.lang.XServiceInfo \ -Tcom.sun.star.uno.XWeak \ -Tcom.sun.star.lang.XSingleServiceFactory \ -Tcom.sun.star.lang.XMultiServiceFactory \ -Tcom.sun.star.uno.XAggregation \ -Tcom.sun.star.lang.XTypeProvider \ -Tcom.sun.star.uno.XComponentContext \ -Tcom.sun.star.lang.XSingleComponentFactory \ -Tcom.sun.star.registry.XRegistryKey \ -Tcom.sun.star.sheet.addin.XQL 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 > $@ $(FLAG2) : $(FLAG1) CPPUMAKER -BUCR $(TYPES) $(TYP_FILE) $(RDB_FILE) echo flagged > $@ $(OBJECTS) : $(FLAG2) .cpp{$(INT_DIR)}.obj: CL $(CC_FLAGS) $(CC_INCLUDES) $< $(FLAG3) : $(FLAG1) $(OBJECTS) LINK $(LFLAGS) $(OBJECTS) echo flagged > $@ $(FLAG4) : $(FLAG3) REGCOMP -register -r $(RDB_FILE) -c $(DLL_FILE) echo flagged > $@ $(FLAG5) : $(FLAG4) $(DLL_DIR) move $(DLL_NAME).* $(DLL_DIR) echo flagged > $@ $(FLAG6) : $(FLAG5) copy $(DLL_DIR)\$(RDB_FILE) "$(OFFICE_PROGRAM_PATH)" copy $(DLL_DIR)\$(DLL_FILE) "$(OFFICE_PROGRAM_PATH)" echo flagged > $@ CLEAN : -@ 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: qladdin.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/qladdin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** qladdin.cpp 29 Jul 2006 15:32:31 -0000 1.2 --- qladdin.cpp 28 Aug 2006 10:05:22 -0000 1.3 *************** *** 1,5 **** /* ! Copyright (C) 2004, 2005 Eric Ehlers This file is part of QuantLib, a free-software/open-source library --- 1,5 ---- /* ! Copyright (C) 2004, 2005, 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library *************** *** 29,33 **** #include <rtl/uuid.h> ! #include <oh/objhandlerdefines.hpp> #ifdef BOOST_MSVC --- 29,33 ---- #include <rtl/uuid.h> ! #include <oh/objhandler.hpp> #ifdef BOOST_MSVC *************** *** 38,42 **** # include <qlo/qladdindefines.hpp> # include <qlo/auto_link.hpp> - # include <log4cxx/auto_link.hpp> # undef BOOST_LIB_DIAGNOSTIC #endif --- 38,41 ---- *************** *** 49,52 **** --- 48,54 ---- using namespace ::com::sun::star; + // instantiate the objecthandler singleton + ObjHandler::ObjectHandler oh; + REF( uno::XInterface ) SAL_CALL QL_CreateInstance( REF( uno::XComponentContext ) const & xContext ) SAL_THROW( () ) { |
