diff options
-rw-r--r-- | writerfilter/prj/build.lst | 1 | ||||
-rw-r--r-- | writerfilter/unocomponent/component.cxx | 9 | ||||
-rw-r--r-- | writerfilter/unocomponent/makefile.mk | 13 | ||||
-rw-r--r-- | writerfilter/util/makefile.mk | 5 |
4 files changed, 19 insertions, 9 deletions
diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst index b7b3c34cc3c1..9c12ea25f05f 100644 --- a/writerfilter/prj/build.lst +++ b/writerfilter/prj/build.lst @@ -2,6 +2,7 @@ wf writerfilter : soltools sal boost cppu cppuhelper ucbhelper NULL wf writerfilter usr1 - all wf_mkout NULL wf writerfilter\source\rtftok nmake - all wf_rtftok NULL wf writerfilter\source\doctok nmake - all wf_doctok NULL +wf writerfilter\source\ooxml nmake - all wf_ooxml NULL wf writerfilter\unocomponent\debugservices\rtftok nmake - all wf_debugservicesrtftok NULL wf writerfilter\unocomponent\debugservices\xxml nmake - all wf_debugservicesxxml NULL wf writerfilter\unocomponent\debugservices\odsl nmake - all wf_debugservicesodl NULL diff --git a/writerfilter/unocomponent/component.cxx b/writerfilter/unocomponent/component.cxx index abbf79a3a873..633805426195 100644 --- a/writerfilter/unocomponent/component.cxx +++ b/writerfilter/unocomponent/component.cxx @@ -4,9 +4,9 @@ * * $RCSfile: component.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hbrinkm $ $Date: 2006-11-01 09:14:37 $ + * last change: $Author: hbrinkm $ $Date: 2007-02-21 13:36:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,6 +81,10 @@ #include <debugservices/doctok/DocTokAnalyzeService.hxx> #endif +#ifndef INCLUDED_OOXML_SCANNERTESTSERVICE_HXX +#include <debugservices/ooxml/OOXMLTestService.hxx> +#endif + using namespace com::sun::star; @@ -97,6 +101,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = RTFSL_PARSER_COMPONENT_ENTRY, /* debugservices.rtfsl.RTFSLParser */ DOCTOK_SCANNERTESTSERVICE_COMPONENT_ENTRY, /* debugservices.doctok.ScannerTestService */ DOCTOK_ANALYZESERVICE_COMPONENT_ENTRY, /* debugservices.doctok.AnalyzeService */ + OOXML_SCANNERTESTSERVICE_COMPONENT_ENTRY, /* debugservices.ooxml.ScannerTestService */ { 0, 0, 0, 0, 0, 0 } // terminate with NULL }; diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk index 410035178839..4af9e036783a 100644 --- a/writerfilter/unocomponent/makefile.mk +++ b/writerfilter/unocomponent/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hbrinkm $ $Date: 2006-11-01 09:30:31 $ +# last change: $Author: hbrinkm $ $Date: 2007-02-21 13:37:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,10 +53,11 @@ SHL1TARGET=$(TARGET) ODIAPILIB=-lodiapi RTFTOKLIB=-lrtftok DOCTOKLIB=-ldoctok +OOXMLLIB=-looxml .ELIF "$(GUI)"=="WNT" ODIAPILIB=$(LB)$/iodiapi.lib RTFTOKLIB=$(LB)$/irtftok.lib -DOCTOKLIB=$(LB)$/idoctok.lib +OOXMLLIB=$(LB)$/iooxml.lib .ENDIF SHL1STDLIBS=$(SALLIB)\ @@ -66,14 +67,16 @@ SHL1STDLIBS=$(SALLIB)\ $(UCBHELPERLIB)\ $(ODIAPILIB) \ $(RTFTOKLIB) \ - $(DOCTOKLIB) + $(DOCTOKLIB) \ + $(OOXMLLIB) SHL1LIBS=\ $(SLB)$/debugservices_xxml.lib \ $(SLB)$/debugservices_rtftok.lib \ $(SLB)$/debugservices_odsl.lib \ $(SLB)$/debugservices_rtfsl.lib \ - $(SLB)$/debugservices_doctok.lib + $(SLB)$/debugservices_doctok.lib \ + $(SLB)$/debugservices_ooxml.lib SHL1IMPLIB=i$(SHL1TARGET) diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk index a9a43eaf54ff..cc06a4c1255f 100644 --- a/writerfilter/util/makefile.mk +++ b/writerfilter/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hbrinkm $ $Date: 2006-11-01 09:30:33 $ +# last change: $Author: hbrinkm $ $Date: 2007-02-21 13:39:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,7 @@ DEFLIB1NAME=godiapi LIB2TARGET=$(SLB)$/$(TARGET2).lib LIB2FILES= \ + $(SLB)$/ooxml.lib \ $(SLB)$/doctok.lib \ $(SLB)$/dmapper.lib \ $(SLB)$/filter.lib |