Simplify type detectors

Change-Id: Ic731c1c4c76d8d6779868d7e3e4c02cb3cadc844
Reviewed-on: https://gerrit.libreoffice.org/9222Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

chart2/CppunitTest_chart2_export.mk

@@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
     embeddedobj/util/embobj \
     eventattacher/source/evtatt \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     forms/util/frm \
     framework/util/fwk \
     i18npool/util/i18npool \

chart2/CppunitTest_chart2_import.mk

@@ -80,6 +80,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
     embeddedobj/util/embobj \
     eventattacher/source/evtatt \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     forms/util/frm \
     framework/util/fwk \
     i18npool/util/i18npool \

sc/CppunitTest_sc_html_export_test.mk

@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\
     configmgr/source/configmgr \
     dbaccess/util/dba \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     forms/util/frm \
     framework/util/fwk \
     i18npool/util/i18npool \

sc/Library_scd.mk

@@ -27,12 +27,8 @@ $(eval $(call gb_Library_use_libraries,scd,\
 	sal \
 	sfx \
 	sot \
-	svl \
-	svt \
 	tl \
-	ucbhelper \
 	utl \
-	vcl \
 	$(gb_UWINAPI) \
 ))
 

sd/Library_sdd.mk

@@ -19,16 +19,13 @@ $(eval $(call gb_Library_use_external,sdd,boost_headers))
 $(eval $(call gb_Library_use_sdk_api,sdd))
 
 $(eval $(call gb_Library_use_libraries,sdd,\
+    comphelper \
     cppu \
     cppuhelper \
     sal \
     sfx \
     sot \
-    svl \
-    svt \
-    svxcore \
     tl \
-    ucbhelper \
     utl \
     vcl \
 	$(gb_UWINAPI) \

starmath/Library_smd.mk

@@ -21,16 +21,14 @@ $(eval $(call gb_Library_use_external,smd,boost_headers))
 $(eval $(call gb_Library_use_sdk_api,smd))
 
 $(eval $(call gb_Library_use_libraries,smd,\
+        comphelper \
         cppu \
         cppuhelper \
         sal \
         sfx \
         sot \
-        svl \
-        svt \
         tl \
-        ucbhelper \
-        vcl \
+        utl \
 		$(gb_UWINAPI) \
 ))
 

sw/CppunitTest_sw_htmlexport.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
     configmgr/source/configmgr \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     filter/source/textfilterdetect/textfd \
 	forms/util/frm \
     framework/util/fwk \

sw/CppunitTest_sw_odfexport.mk

@@ -54,6 +54,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
     configmgr/source/configmgr \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     framework/util/fwk \
     i18npool/util/i18npool \
     linguistic/source/lng \

sw/CppunitTest_sw_odfimport.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
     configmgr/source/configmgr \
 	embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     framework/util/fwk \
     i18npool/util/i18npool \
 	lingucomponent/source/languageguessing/guesslang \

sw/CppunitTest_sw_ooxmlexport.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
 	$(sw_ooxmlexport_components) \
+	filter/source/storagefilterdetect/storagefd \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport))

sw/CppunitTest_sw_ooxmlsdrexport.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlsdrexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlsdrexport,\
 	$(sw_ooxmlexport_components) \
+	filter/source/storagefilterdetect/storagefd \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlsdrexport))

sw/CppunitTest_sw_rtfexport.mk

@@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
     configmgr/source/configmgr \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     framework/util/fwk \
     i18npool/util/i18npool \
     linguistic/source/lng \

sw/CppunitTest_sw_rtfimport.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
     configmgr/source/configmgr \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     framework/util/fwk \
     i18npool/util/i18npool \
     linguistic/source/lng \

sw/CppunitTest_sw_uiwriter.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_uiwriter,\
     configmgr/source/configmgr \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     framework/util/fwk \
     i18npool/util/i18npool \
     linguistic/source/lng \

sw/CppunitTest_sw_ww8export.mk

@@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
     dbaccess/util/dba \
     embeddedobj/util/embobj \
     filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
     forms/util/frm \
     framework/util/fwk \
     i18npool/util/i18npool \

sw/Library_swd.mk

@@ -43,12 +43,9 @@ $(eval $(call gb_Library_use_libraries,swd,\
     sal \
     sfx \
     sot \
-    svl \
     svt \
     tl \
-    ucbhelper \
     utl \
-    vcl \
 	$(gb_UWINAPI) \
 ))
 

sw/source/ui/uno/swdetect.hxx

@@ -57,8 +57,6 @@ class SfxFilter;
 
 class SwFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
-    static sal_uLong    DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
-    static sal_uLong    GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
 public:
                             SwFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
     virtual                 ~SwFilterDetect();