# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1303140561 0
# Node ID 1cbf1719c76b9f60899c04686ea61d24d5af7f35
# Parent  7fb88ce21711c0e03da80bf53f6836ff9d833c51
rtftok01: writerfilter: enable build of the RTF lexer

diff --git a/writerfilter/inc/rtftok/RTFScannerHandler.hxx b/writerfilter/inc/rtftok/RTFScannerHandler.hxx
--- a/writerfilter/inc/rtftok/RTFScannerHandler.hxx
+++ b/writerfilter/inc/rtftok/RTFScannerHandler.hxx
@@ -28,6 +28,8 @@
 #ifndef INCLUDED_RTFSCANNERHANDLER_HXX
 #define INCLUDED_RTFSCANNERHANDLER_HXX
 
+#include <sal/types.h>
+
 namespace writerfilter { namespace rtftok {
 
 class RTFScannerHandler
diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst
--- a/writerfilter/prj/build.lst
+++ b/writerfilter/prj/build.lst
@@ -3,9 +3,11 @@
 wf	writerfilter\source\resourcemodel	nmake	-	all	wf_resourcemodel NULL
 wf	writerfilter\source\doctok	nmake	-	all	wf_doctok wf_resourcemodel NULL
 wf	writerfilter\source\ooxml	nmake	-	all	wf_ooxml wf_resourcemodel NULL
+wf	writerfilter\source\rtftok	nmake	-	all	wf_rtftok wf_resourcemodel NULL
 wf  writerfilter\source\filter      nmake   - all   wf_filter NULL
 wf  writerfilter\source\dmapper      nmake   - all   wf_dmapper wf_doctok wf_ooxml wf_resourcemodel NULL
 wf	writerfilter\unocomponent\debugservices\doctok	nmake	-	all	wf_debugservicesdoctok NULL
 wf	writerfilter\unocomponent\debugservices\ooxml	nmake	-	all	wf_debugservicesooxml NULL
-wf	writerfilter\unocomponent	nmake	-	all	wf_unocomponent wf_doctok wf_ooxml wf_resourcemodel wf_debugservicesdoctok wf_debugservicesooxml NULL
-wf  writerfilter\util   nmake   - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_unocomponent NULL
+wf	writerfilter\unocomponent\debugservices\rtftok	nmake	-	all	wf_debugservicesrtftok NULL
+wf	writerfilter\unocomponent	nmake	-	all	wf_unocomponent wf_doctok wf_ooxml wf_rtftok wf_resourcemodel wf_debugservicesdoctok wf_debugservicesooxml wf_debugservicesrtftok NULL
+wf  writerfilter\util   nmake   - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_rtftok wf_unocomponent NULL
diff --git a/writerfilter/unocomponent/component.cxx b/writerfilter/unocomponent/component.cxx
--- a/writerfilter/unocomponent/component.cxx
+++ b/writerfilter/unocomponent/component.cxx
@@ -37,6 +37,8 @@
 #include <debugservices/doctok/DocTokAnalyzeService.hxx>
 #include <debugservices/ooxml/OOXMLTestService.hxx>
 #include <debugservices/ooxml/OOXMLAnalyzeService.hxx>
+#include <debugservices/rtftok/ScannerTestService.hxx>
+#include <debugservices/rtftok/XMLScanner.hxx>
 
 #include <stdio.h>
 
@@ -52,6 +54,8 @@
 	DOCTOK_ANALYZESERVICE_COMPONENT_ENTRY, /* debugservices.doctok.AnalyzeService */
 	OOXML_SCANNERTESTSERVICE_COMPONENT_ENTRY, /* debugservices.ooxml.ScannerTestService */
 	OOXML_ANALYZESERVICE_COMPONENT_ENTRY, /* debugservices.ooxml.AnalyzeService */
+    RTFTOK_SCANNERTESTSERVICE_COMPONENT_ENTRY,
+    RTFTOK_XMLSCANNER_COMPONENT_ENTRY,
 	{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk
--- a/writerfilter/unocomponent/makefile.mk
+++ b/writerfilter/unocomponent/makefile.mk
@@ -45,19 +45,23 @@
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
 DOCTOKLIB=-ldoctok
 OOXMLLIB=-looxml
+RTFTOKLIB=-lrtftok
 RESOURCEMODELLIB=-lresourcemodel
 .ELIF "$(GUI)"=="OS2"
 DOCTOKLIB=$(LB)$/idoctok.lib
 OOXMLLIB=$(LB)$/iooxml.lib
+RTFTOKLIB=$(LB)$/irtftok.lib
 RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
 .ELIF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 DOCTOKLIB=-ldoctok
 OOXMLLIB=-looxml
+RTFTOKLIB=-lrtftok
 RESOURCEMODELLIB=-lresourcemodel
 .ELSE
 DOCTOKLIB=$(LB)$/idoctok.lib
 OOXMLLIB=$(LB)$/iooxml.lib
+RTFTOKLIB=$(LB)$/irtftok.lib
 RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
 .ENDIF
 .ENDIF
@@ -69,11 +73,15 @@
 	$(UCBHELPERLIB)\
 	$(DOCTOKLIB) \
 	$(OOXMLLIB) \
-	$(RESOURCEMODELLIB)
+	$(RTFTOKLIB) \
+	$(RESOURCEMODELLIB) \
+
 
 SHL1LIBS=\
 	$(SLB)$/debugservices_doctok.lib \
-	$(SLB)$/debugservices_ooxml.lib
+	$(SLB)$/debugservices_ooxml.lib \
+	$(SLB)$/debugservices_rtftok.lib \
+
 
 SHL1IMPLIB=i$(SHL1TARGET)
 
