xmloff: create XMLImpressSettingsExportOOO instances with an uno constructor

See tdf#74608 for motivation.

Change-Id: Iadb687fc4d55a093cef262b1205ca6a4da89bfa3
Reviewed-on: https://gerrit.libreoffice.org/77934
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

4 files changed, 10 insertions, 8 deletions

diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 69f45f0920af..610c4d85b949 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -39,11 +39,6 @@ css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() thro
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> XMLImpressExportOOO_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString XMLImpressSettingsExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis export
 OUString XMLDrawExportOasis_getImplementationName() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index a7e1483df906..ad84f7f0aece 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -60,7 +60,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
 
         // impress OOo export
         else SINGLEFACTORY( XMLImpressExportOOO )
-        else SINGLEFACTORY( XMLImpressSettingsExportOOO )
 
         // draw oasis export
         else SINGLEFACTORY( XMLDrawExportOasis )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 8f4e09d431a0..b2c35150323e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2685,8 +2685,15 @@ com_sun_star_comp_Impress_XMLMetaExporter_get_implementation(
         new SdXMLExport(pCtx, "XMLImpressMetaExportOOO", false, SvXMLExportFlags::META));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(
+        new SdXMLExport(pCtx, "XMLImpressSettingsExportOOO", false, SvXMLExportFlags::SETTINGS));
+}
+
 SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
-SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, SvXMLExportFlags::SETTINGS );
 
 SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
 SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 7afbec76ea98..7c97cf2275ec 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -135,7 +135,8 @@
     constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
   </implementation>
-  <implementation name="XMLImpressSettingsExportOOO">
+  <implementation name="XMLImpressSettingsExportOOO"
+    constructor="com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLSettingsExporter"/>
   </implementation>
   <implementation name="XMLImpressSettingsExportOasis"