merge sdfilt library into sd
it is very small, and this means we can get rid of some ugly runtime
symbol loading
Change-Id: I1d5f5da6a9e908ccd018915bf09b9ab97d67feb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139866
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/Repository.mk b/Repository.mk
index f1fe292..ef2de04 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -445,7 +445,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
scn \
sd \
sdd \
sdfilt \
sfx \
slideshow \
sot \
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk
index 90c12ff..e0bc864 100644
--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_dump,\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk
index f246759..d9813dd 100644
--- a/chart2/CppunitTest_chart2_geometry.mk
+++ b/chart2/CppunitTest_chart2_geometry.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_geometry,\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index 4dc7dca..92f92126 100644
--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index 2ef23fc..9d8c5f9 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index 4ea9246..c985436 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/export_setup.mk b/chart2/export_setup.mk
index 3599736..be07efc 100644
--- a/chart2/export_setup.mk
+++ b/chart2/export_setup.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export$(1),\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/chart2/import_setup.mk b/chart2/import_setup.mk
index fb83a04..2f27fffb 100644
--- a/chart2/import_setup.mk
+++ b/chart2/import_setup.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import$(1),\
sw/util/swd \
sw/util/msword \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(call gb_Helper_optional,SCRIPTING, \
sc/util/vbaobj) \
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
index eab7c73..73ea306 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu
@@ -19,7 +19,7 @@
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>sdfilt</value></prop>
<prop oor:name="UserData"><value>sd</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">PowerPoint 97–2003</value>
</prop>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
index 24683ea..62358fa 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
@@ -19,7 +19,7 @@
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN STARTPRESENTATION</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>sdfilt</value></prop>
<prop oor:name="UserData"><value>sd</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">PowerPoint 97–2003 AutoPlay</value>
</prop>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
index 4de589b..098b294 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
@@ -19,7 +19,7 @@
<prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH ALIEN</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>sdfilt</value></prop>
<prop oor:name="UserData"><value>sd</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>impress_MS_PowerPoint_97_Vorlage</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/sd/CppunitTest_sd_filter_eppt.mk b/sd/CppunitTest_sd_filter_eppt.mk
index 0105efe..4229e1b 100644
--- a/sd/CppunitTest_sd_filter_eppt.mk
+++ b/sd/CppunitTest_sd_filter_eppt.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_filter_eppt, \
$(eval $(call gb_CppunitTest_use_libraries,sd_filter_eppt, \
comphelper \
cppu \
sdfilt \
sd \
sal \
test \
unotest \
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index ce1e0dd..b80c466 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\
package/util/package2 \
sax/source/expatwrap/expwrap \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
sfx2/util/sfx \
sot/util/sot \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 9d29b40..1a3a871 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -178,6 +178,22 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/core/undo/undoobjects \
sd/source/core/undoanim \
sd/source/filter/cgm/sdcgmfilter \
sd/source/filter/eppt/eppt \
sd/source/filter/eppt/epptso \
sd/source/filter/eppt/escherex \
sd/source/filter/eppt/pptexanimations \
sd/source/filter/eppt/pptexsoundcollection \
sd/source/filter/eppt/pptx-epptbase \
sd/source/filter/eppt/pptx-epptooxml \
sd/source/filter/eppt/pptx-animations \
sd/source/filter/eppt/pptx-grouptable \
sd/source/filter/eppt/pptx-stylesheet \
sd/source/filter/eppt/pptx-text \
sd/source/filter/ppt/ppt97animations \
sd/source/filter/ppt/pptatom \
sd/source/filter/ppt/pptin \
sd/source/filter/ppt/pptinanimations \
sd/source/filter/ppt/propread \
sd/source/filter/grf/sdgrffilter \
sd/source/filter/html/HtmlOptionsDialog \
sd/source/filter/html/buttonset \
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
deleted file mode 100644
index 2db739d..0000000
--- a/sd/Library_sdfilt.mk
+++ /dev/null
@@ -1,79 +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,sdfilt))
$(eval $(call gb_Library_set_include,sdfilt,\
$$(INCLUDE) \
-I$(SRCDIR)/sd/inc \
-I$(SRCDIR)/sd/source/ui/inc \
))
ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
$(eval $(call gb_Library_add_defs,sdfilt,\
-DDBG_ANIM_LOG \
))
endif
$(eval $(call gb_Library_use_external,sdfilt,boost_headers))
$(eval $(call gb_Library_use_custom_headers,sdfilt,\
oox/generated \
))
$(eval $(call gb_Library_use_sdk_api,sdfilt))
$(eval $(call gb_Library_use_libraries,sdfilt,\
comphelper \
cppu \
cppuhelper \
editeng \
i18nlangtag \
i18nutil \
msfilter \
oox \
sal \
sax \
sd \
sfx \
sot \
svl \
svt \
svxcore \
tl \
ucbhelper \
utl \
vcl \
basegfx \
))
$(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt,services))
$(eval $(call gb_Library_use_common_precompiled_header,sdfilt))
$(eval $(call gb_Library_add_exception_objects,sdfilt,\
sd/source/filter/eppt/eppt \
sd/source/filter/eppt/epptso \
sd/source/filter/eppt/escherex \
sd/source/filter/eppt/pptexanimations \
sd/source/filter/eppt/pptexsoundcollection \
sd/source/filter/eppt/pptx-epptbase \
sd/source/filter/eppt/pptx-epptooxml \
sd/source/filter/eppt/pptx-animations \
sd/source/filter/eppt/pptx-grouptable \
sd/source/filter/eppt/pptx-stylesheet \
sd/source/filter/eppt/pptx-text \
sd/source/filter/ppt/ppt97animations \
sd/source/filter/ppt/pptatom \
sd/source/filter/ppt/pptin \
sd/source/filter/ppt/pptinanimations \
sd/source/filter/ppt/propread \
))
# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 62915e1..93cf5e0 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_Module,sd))
$(eval $(call gb_Module_add_targets,sd,\
Library_sd \
Library_sdd \
Library_sdfilt \
Library_sdui \
Package_opengl \
Package_web \
diff --git a/sd/import_setup.mk b/sd/import_setup.mk
index 0fd0984..3fa7ac7 100644
--- a/sd/import_setup.mk
+++ b/sd/import_setup.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests$(1),\
package/util/package2 \
sax/source/expatwrap/expwrap \
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
$(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \
sfx2/util/sfx \
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 33bbe48..1ed0f79 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -70,7 +70,7 @@ void SdFiltersTest::testCVEs()
#ifndef DISABLE_CVE_TESTS
testDir("MS PowerPoint 97",
m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/"),
"sdfilt");
"sd");
testDir("Impress Office Open XML",
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/"),
@@ -78,11 +78,11 @@ void SdFiltersTest::testCVEs()
testDir("impress8",
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/"),
"sdfilt");
"sd");
testDir("draw8",
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/"),
"sdfilt");
"sd");
testDir("CGM - Computer Graphics Metafile",
m_directories.getURLFromSrc(u"/sd/qa/unit/data/cgm/"),
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 03b087f..d5e6371 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -77,7 +77,7 @@ nFormatType: <prop oor:name="Flags">...</prop>
static FileFormat aFileFormats[] =
{
{ "odp", "impress8", "impress8", "", ODP_FORMAT_TYPE },
{ "ppt", "MS PowerPoint 97", "impress_MS_PowerPoint_97", "sdfilt", PPT_FORMAT_TYPE },
{ "ppt", "MS PowerPoint 97", "impress_MS_PowerPoint_97", "sd", PPT_FORMAT_TYPE },
{ "pptx", "Impress Office Open XML", "Office Open XML Presentation", "", PPTX_FORMAT_TYPE },
{ "html", "graphic_HTML", "graphic_HTML", "", HTML_FORMAT_TYPE },
{ "pdf", "draw_pdf_import", "pdf_Portable_Document_Format", "", PDF_FORMAT_TYPE },
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 3df3edb..24aa42a 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -88,7 +88,7 @@ oslGenericFunction SdFilter::GetLibrarySymbol( const OUString& rLibraryName, con
void SdFilter::Preload()
{
(void)GetLibrarySymbol("sdfilt", "ImportPPT");
(void)GetLibrarySymbol("sd", "ImportPPT");
}
#endif
diff --git a/sd/util/sd.component b/sd/util/sd.component
index f1937a0..fbe7778 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -109,4 +109,6 @@
constructor="RandomAnimationNode_get_implementation">
<service name="com.sun.star.comp.sd.RandomAnimationNode"/>
</implementation>
<implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"
constructor="css_comp_Impress_oox_PowerPointExport"/>
</component>
diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component
deleted file mode 100644
index 5e4bab2..0000000
--- a/sd/util/sdfilt.component
+++ /dev/null
@@ -1,13 +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/.
*
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Impress.oox.PowerPointExport" constructor="css_comp_Impress_oox_PowerPointExport"/>
</component>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 517df4a..a0ccdcb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -714,10 +714,9 @@ draw_constructor_list = [
"com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation",
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
"org_openoffice_comp_Draw_framework_PanelFactory_get_implementation",
"css_comp_Impress_oox_PowerPointExport",
# sd/util/sdd.component
"com_sun_star_comp_draw_FormatDetector_get_implementation",
# sd/util/sdfilt.component
"css_comp_Impress_oox_PowerPointExport",
# writerperfect/source/draw/wpftdraw.component
"com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
# sdext/source/pdfimport/pdfimport.component
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 2d2c427..97aa302 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -181,7 +181,6 @@ fuzzer_writer_libraries = \
guesslang \
fuzzer_draw_libraries = \
sdfilt \
sd \
sdd \
icg \
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 49503414..2d624b8 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -427,7 +427,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
static FFilterCall pfnImport(nullptr);
if (!pfnImport)
{
pfnImport = load(u"libsdfiltlo.so", "TestImportPPT");
pfnImport = load(u"libsdlo.so", "TestImportPPT");
}
SvFileStream aFileStream(out, StreamMode::READ);
ret = static_cast<int>((*pfnImport)(aFileStream));
