Wed Dec 11 12:45:56 PST 2013

Repository.mk                                            |    1 
 android/experimental/LibreOffice4Android/native-code.cxx |    2 
 android/experimental/desktop/native-code.cxx             |    2 
 chart2/CppunitTest_chart2_export.mk                      |    1 
 chart2/CppunitTest_chart2_import.mk                      |    1 
 cppuhelper/source/shlib.cxx                              |    2 
 dbaccess/CppunitTest_dbaccess_dialog_save.mk             |    1 
 dbaccess/CppunitTest_dbaccess_macros_test.mk             |    1 
 ios/experimental/LibreOffice/LibreOffice/lo.mm           |    2 
 ios/qa/sc/Makefile                                       |    4 -
 ios/qa/sc/filters-test.m                                 |    1 
 ios/shared/ios_sharedlo/cxx/mlo.mm                       |    3 
 oox/Library_oox.mk                                       |    2 
 postprocess/Rdb_services.mk                              |    1 
 sax/CppunitTest_sax_parser.mk                            |    2 
 sax/Library_expwrap.mk                                   |   14 +++-
 sax/Library_fastsax.mk                                   |   48 ---------------
 sax/Module_sax.mk                                        |    2 
 sax/StaticLibrary_sax_shared.mk                          |   23 -------
 sax/source/expatwrap/expwrap.component                   |    3 
 sax/source/expatwrap/sax_expat.cxx                       |   18 +++++
 sax/source/fastparser/fastparser.cxx                     |   35 ----------
 sax/source/fastparser/fastsax.component                  |   25 -------
 sc/CppunitTest_sc_annotationobj.mk                       |    1 
 sc/CppunitTest_sc_annotationshapeobj.mk                  |    1 
 sc/CppunitTest_sc_annotationsobj.mk                      |    1 
 sc/CppunitTest_sc_cellrangeobj.mk                        |    1 
 sc/CppunitTest_sc_chart_regression_test.mk               |    1 
 sc/CppunitTest_sc_databaserangeobj.mk                    |    1 
 sc/CppunitTest_sc_datapilotfieldobj.mk                   |    1 
 sc/CppunitTest_sc_datapilottableobj.mk                   |    1 
 sc/CppunitTest_sc_editfieldobj_cell.mk                   |    1 
 sc/CppunitTest_sc_editfieldobj_header.mk                 |    1 
 sc/CppunitTest_sc_filters_test.mk                        |    1 
 sc/CppunitTest_sc_macros_test.mk                         |    1 
 sc/CppunitTest_sc_modelobj.mk                            |    1 
 sc/CppunitTest_sc_namedrangeobj.mk                       |    1 
 sc/CppunitTest_sc_namedrangesobj.mk                      |    1 
 sc/CppunitTest_sc_opencl_test.mk                         |    1 
 sc/CppunitTest_sc_outlineobj.mk                          |    1 
 sc/CppunitTest_sc_rangelst_test.mk                       |    1 
 sc/CppunitTest_sc_subsequent_export_test.mk              |    1 
 sc/CppunitTest_sc_subsequent_filters_test.mk             |    1 
 sc/CppunitTest_sc_tableautoformatfield.mk                |    1 
 sc/CppunitTest_sc_tablesheetobj.mk                       |    1 
 sc/CppunitTest_sc_tablesheetsobj.mk                      |    1 
 sd/CppunitTest_sd_filters_test.mk                        |    1 
 sd/CppunitTest_sd_import_tests.mk                        |    1 
 sw/CppunitTest_sw_filters_test.mk                        |    1 
 sw/CppunitTest_sw_htmlexport.mk                          |    1 
 sw/CppunitTest_sw_layout_test.mk                         |    1 
 sw/CppunitTest_sw_macros_test.mk                         |    1 
 sw/CppunitTest_sw_odfexport.mk                           |    1 
 sw/CppunitTest_sw_ooxmlexport.mk                         |    1 
 sw/CppunitTest_sw_ooxmlimport.mk                         |    1 
 55 files changed, 34 insertions(+), 192 deletions(-)

New commits:
commit eebc1e9a8a5c7fd04b795c62791a70eed65995e4
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Wed Dec 11 12:01:21 2013 -0200

    fdo#60698: Merge fastsax and sax_shared into expwrap
    
    Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4
    Reviewed-on: https://gerrit.libreoffice.org/6967
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>

diff --git a/Repository.mk b/Repository.mk
index 5405d69..d4a103c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -253,7 +253,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	evtatt \
 	exp \
 	expwrap \
-	fastsax \
 	flat \
 	file \
 	filterconfig \
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 00fec00..9e65d8d 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -22,7 +22,6 @@ extern "C"
     extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * expwrap_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fastsax_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -87,7 +86,6 @@ lo_get_libmap(void)
         { "libemboleobj.a", emboleobj_component_getFactory },
         { "libevtattlo.a", evtatt_component_getFactory },
         { "libexpwrap.uno.a", expwrap_component_getFactory },
-        { "libfastsax.uno.a", fastsax_component_getFactory },
         { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfrmlo.a", frm_component_getFactory },
         { "libfsstoragelo.a", fsstorage_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index 54d9130..f16eab3 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -23,7 +23,6 @@ extern "C"
     extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * expwrap_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fastsax_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -92,7 +91,6 @@ lo_get_libmap(void)
         { "libemboleobj.a", emboleobj_component_getFactory },
         { "libevtattlo.a", evtatt_component_getFactory },
         { "libexpwraplo.a", expwrap_component_getFactory },
-        { "libfastsaxlo.a", fastsax_component_getFactory },
         { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfrmlo.a", frm_component_getFactory },
         { "libfsstoragelo.a", fsstorage_component_getFactory },
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 93b8821..a861693 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 8075625..2c74eb5 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 6176b23..e941b9d 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -235,7 +235,6 @@ extern "C"
     extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * fwk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * introspection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -321,7 +320,6 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
         { "libconfigmgrlo.a", configmgr_component_getFactory },
         { "libdeployment.a", deployment_component_getFactory },
         { "libexpwraplo.a", expwrap_component_getFactory },
-        { "libfastsaxlo.a", fastsax_component_getFactory },
         { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfwklo.a", fwk_component_getFactory },
         { "libi18npoollo.a", i18npool_component_getFactory },
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 8b5832e..4d99ed8 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_dialog_save,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     scripting/source/basprov/basprov \
     scripting/util/scriptframe \
     sfx2/util/sfx \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 2fa16c8..d5baaea 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     scripting/source/basprov/basprov \
     scripting/util/scriptframe \
     sfx2/util/sfx \
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 429bb1a..610eda9 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -29,7 +29,6 @@ extern "C" {
     extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * expwrap_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * fastsax_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * filterconfig1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * frm_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * fsstorage_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -92,7 +91,6 @@ lo_get_libmap(void)
         { "libemboleobj.a", emboleobj_component_getFactory },
         { "libevtattlo.a", evtatt_component_getFactory },
         { "libexpwraplo.a", expwrap_component_getFactory },
-        { "libfastsaxlo.a", fastsax_component_getFactory },
         { "libfilterconfiglo.a", filterconfig1_component_getFactory },
         { "libfrmlo.a", frm_component_getFactory },
         { "libfsstoragelo.a", fsstorage_component_getFactory },
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 0e7dc78..26cb10c 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -l
 ucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxm
 llo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP) stuff
 
@@ -81,7 +81,7 @@ stuff:
 	cp $(INSTDIR)/ure/share/misc/types.rdb $(APPDIR)/ure
 #
 # a bunch of .component files
-	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/chartcore comphelper/util/comphelp eventattacher/source/evtatt filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \
+	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/chartcore comphelper/util/comphelp eventattacher/source/evtatt filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \
 		mkdir -p $(APPDIR)/ComponentTarget/`dirname $$F`; \
 	        cp $(WORKDIR)/ComponentTarget/$$F.component $(APPDIR)/ComponentTarget/$$F.component; \
 	done
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index b664a39..c1dade9 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -137,7 +137,6 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
         "ComponentTarget/package/source/xstor/xstor.component",
         "ComponentTarget/package/util/package2.component",
         "ComponentTarget/sax/source/expatwrap/expwrap.component",
-        "ComponentTarget/sax/source/fastparser/fastsax.component",
         "ComponentTarget/sc/util/sc.component",
         "ComponentTarget/sc/util/scfilt.component",
         "ComponentTarget/scaddins/source/analysis/analysis.component",
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm
index ca88b6e..50ffd44 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -91,7 +91,6 @@ extern "C" {
     ADD_LIB(embobj);            // needed for embeded objects
     ADD_LIB(emboleobj);         // needed for embeded objects
     ADD_LIB(expwrap);           // Wrapper around expat using UNO.
-    ADD_LIB(fastsax);           // Wrapper around expat using UNO.
     //ADD_LIB(protocolhandler); // Scripting 
     
     //ADD_LIB(sb);              // StarBasic * (tied to writer)
@@ -156,7 +155,7 @@ lo_get_libmap(void)
         //MAP_LIB(ucppkg1),     //MAP_LIB_LO(vbaswobj), //MAP_LIB_LO(wpftwriter),
         //MAP_LIB_LO(wpftdraw), //MAP_LIB_LO(svxcore),  //MAP_LIB_LO(protocolhandler),
         //MAP_LIB_LO_1(filterconfig), //MAP_LIB_LO(canvasfactory),    //MAP_LIB_LO(mtfrenderer),
-        MAP_LIB_LO(expwrap),    MAP_LIB_LO(fastsax),    MAP_LIB_LO(writerfilter),
+        MAP_LIB_LO(expwrap),    MAP_LIB_LO(writerfilter),
         MAP_LIB(embobj),        MAP_LIB(emboleobj),     MAP_LIB_LO(sot),
         
         // ADDED for search
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0a4fc04..d176267 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -39,8 +39,8 @@ $(eval $(call gb_Library_use_libraries,oox,\
     cppu \
     cppuhelper \
     editeng \
+    expwrap \
     drawinglayer \
-    fastsax \
     msfilter \
     sal \
 	i18nlangtag \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c3a4d0f..a49b1dd 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	package/source/xstor/xstor \
 	package/util/package2 \
 	sax/source/expatwrap/expwrap \
-	sax/source/fastparser/fastsax \
 	sc/util/sc \
 	sc/util/scd \
 	sc/util/scfilt \
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk
index fe411d5..b94b826 100644
--- a/sax/CppunitTest_sax_parser.mk
+++ b/sax/CppunitTest_sax_parser.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_components,sax_parser,\
 	framework/util/fwk \
 	i18npool/util/i18npool \
 	oox/util/oox \
-	sax/source/fastparser/fastsax \
+	sax/source/expatwrap/expwrap \
 	sfx2/util/sfx \
 	ucb/source/core/ucb1 \
 	ucb/source/ucp/file/ucpfile1 \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 67eeb77..7e3b53e 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -16,27 +16,33 @@ $(eval $(call gb_Library_set_include,expwrap,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_add_defs,expwrap,\
+    -DFASTSAX_DLLIMPLEMENTATION \
+))
+
 $(eval $(call gb_Library_use_sdk_api,expwrap))
 
 $(eval $(call gb_Library_use_externals,expwrap,\
+    boost_headers \
     expat \
+    zlib \
 ))
 
 $(eval $(call gb_Library_use_libraries,expwrap,\
     cppu \
     cppuhelper \
     sal \
+    salhelper \
+    sax \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_static_libraries,expwrap,\
-	sax_shared \
-))
-
 $(eval $(call gb_Library_add_exception_objects,expwrap,\
 	sax/source/expatwrap/attrlistimpl \
 	sax/source/expatwrap/sax_expat \
 	sax/source/expatwrap/saxwriter \
+	sax/source/expatwrap/xml2utf \
+	sax/source/fastparser/fastparser \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
deleted file mode 100644
index 1fcb503..0000000
--- a/sax/Library_fastsax.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,fastsax))
-
-$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax))
-
-$(eval $(call gb_Library_set_include,fastsax,\
-    -I$(SRCDIR)/sax/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_defs,fastsax,\
-    -DFASTSAX_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,fastsax))
-
-$(eval $(call gb_Library_use_externals,fastsax,\
-	boost_headers \
-	expat \
-	zlib \
-))
-
-$(eval $(call gb_Library_use_libraries,fastsax,\
-    cppu \
-    cppuhelper \
-    sal \
-	salhelper \
-	sax \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_static_libraries,fastsax,\
-	sax_shared \
-))
-
-$(eval $(call gb_Library_add_exception_objects,fastsax,\
-	sax/source/fastparser/fastparser \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
index 63c993a..ae8ab9c6 100644
--- a/sax/Module_sax.mk
+++ b/sax/Module_sax.mk
@@ -11,9 +11,7 @@ $(eval $(call gb_Module_Module,sax))
 
 $(eval $(call gb_Module_add_targets,sax,\
 	Library_expwrap \
-	Library_fastsax \
 	Library_sax \
-	StaticLibrary_sax_shared \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sax,\
diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk
deleted file mode 100644
index cdbc3c8..0000000
--- a/sax/StaticLibrary_sax_shared.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared))
-
-$(eval $(call gb_StaticLibrary_set_include,sax_shared,\
-    -I$(SRCDIR)/sax/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_use_sdk_api,sax_shared))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,sax_shared,\
-	sax/source/expatwrap/xml2utf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component
index cc82266..e3e474b 100644
--- a/sax/source/expatwrap/expwrap.component
+++ b/sax/source/expatwrap/expwrap.component
@@ -25,4 +25,7 @@
   <implementation name="com.sun.star.extensions.xml.sax.Writer">
     <service name="com.sun.star.xml.sax.Writer"/>
   </implementation>
+  <implementation name="com.sun.star.comp.extensions.xml.sax.FastParser">
+     <service name="com.sun.star.xml.sax.FastParser"/>
+  </implementation>
 </component>
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index e58f75a..8e066e8 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -37,7 +37,6 @@
 
 #include <expat.h>
 
-using namespace ::rtl;
 using namespace ::std;
 using namespace ::osl;
 using namespace ::cppu;
@@ -50,6 +49,9 @@ using namespace ::com::sun::star::io;
 #include "factory.hxx"
 #include "attrlistimpl.hxx"
 #include "xml2utf.hxx"
+#include <sax/fastparser.hxx>
+
+#define PARSER_IMPLEMENTATION_NAME "com.sun.star.comp.extensions.xml.sax.FastParser"
 
 namespace sax_expatwrap {
 
@@ -195,7 +197,13 @@ Reference< XInterface > SAL_CALL SaxExpatParser_CreateInstance(
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
 
-
+Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance(
+            SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
+        throw(Exception)
+{
+    ::sax_fastparser::FastSaxParser *p = new ::sax_fastparser::FastSaxParser;
+    return Reference< XInterface > ( (OWeakObject * ) p );
+}
 
 Sequence< OUString >    SaxExpatParser::getSupportedServiceNames_Static(void) throw ()
 {
@@ -1084,6 +1092,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL expwrap_component_getFactory(
                                         SaxWriter_CreateInstance,
                                         SaxWriter_getSupportedServiceNames() );
         }
+        else if ( aImplementationName == PARSER_IMPLEMENTATION_NAME)
+        {
+            xRet = createSingleFactory( xSMgr, aImplementationName,
+                                        FastSaxParser_CreateInstance,
+                                        sax_fastparser::FastSaxParser::getSupportedServiceNames_Static() );
+        }
 
         if (xRet.is())
         {
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 4f835d5..af73f23 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1490,39 +1490,4 @@ Reference< XInterface > SAL_CALL FastSaxParser_CreateInstance(
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
 
-extern "C" {
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL fastsax_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager,
-    SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
-{
-    void * pRet = 0;
-
-    if (pServiceManager )
-    {
-        Reference< XSingleServiceFactory > xRet;
-        Reference< XMultiServiceFactory > xSMgr( reinterpret_cast< XMultiServiceFactory * > ( pServiceManager ) );
-
-        OUString aImplementationName( OUString::createFromAscii( pImplName ) );
-
-        if ( aImplementationName == PARSER_IMPLEMENTATION_NAME  )
-        {
-            xRet = createSingleFactory(
-                xSMgr, aImplementationName,
-                FastSaxParser_CreateInstance,
-                sax_fastparser::FastSaxParserImpl::getSupportedServiceNames_Static() );
-        }
-
-        if (xRet.is())
-        {
-            xRet->acquire();
-            pRet = xRet.get();
-        }
-    }
-
-    return pRet;
-}
-
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/source/fastparser/fastsax.component b/sax/source/fastparser/fastsax.component
deleted file mode 100644
index cc130e0..0000000
--- a/sax/source/fastparser/fastsax.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fastsax"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.extensions.xml.sax.FastParser">
-    <service name="com.sun.star.xml.sax.FastParser"/>
-  </implementation>
-</component>
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index cc632fa..297c16e 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index db4dbcd..16158c1 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index b2daad5..e26df98 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 3be6547..efd940b 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index e413f8c..7564c6d 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 2eb62ee..c4aa12e 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 0c49f98..9435535 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index bf739ca..c467c2d 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 47cfb68..ca83173 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 9ec9fe5..eb6c494 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index e71d581..86a13f8 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scfilt \
     scaddins/source/analysis/analysis \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 92c84a2..19388be 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index c211a55..43f3cb0 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 5452d44..0cf0c4a 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index baf47f4..60c589c 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index ef5792c..40e9c1a 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_opencl_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scfilt \
     scaddins/source/analysis/analysis \
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index cfaf818..e8cc335 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 3b5e347..847f5eb 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index be3bbb7..6345a9c 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scfilt \
     scaddins/source/analysis/analysis \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index f57e1c7..9dd130d 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scfilt \
     scaddins/source/analysis/analysis \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 5ec9288..53f38fa 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 4dab518..493b3bf 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 723d436..7a61187 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scd \
     sc/util/scfilt \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 58dffc9..a2d1562 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sd/util/sd \
     sd/util/sdfilt \
     sfx2/util/sfx \
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index a0f2ad9..d1a552f 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sd/util/sd \
     sd/util/sdfilt \
     sd/util/sdd \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 0cc65fd..cc1a9e9 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sfx2/util/sfx \
     svtools/util/svt \
     sw/util/msword \
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 5f0ed06..0179bdd 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sw/util/sw \
     sw/util/swd \
     sw/util/msword \
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 370cff8..017ba1b 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sw/util/sw \
     sw/util/swd \
     sw/util/msword \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 819e0f8..6e6f247 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sw/util/sw \
     sw/util/swd \
     sw/util/msword \
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 8c0842e..c369055 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sfx2/util/sfx \
     starmath/util/sm \
     svl/source/fsstor/fsstorage \
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 6e21d5d..eb3acba 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sw/util/sw \
     sw/util/swd \
     sw/util/msword \
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index fe1cefe..2c383e8 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
     package/source/xstor/xstor \
     package/util/package2 \
     sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
     sw/util/sw \
     sw/util/swd \
     sw/util/msword \
