[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

[Miklos Vajna (via logerrit)]

 solenv/bin/native-code.py       |    1 +
 xmloff/inc/facreg.hxx           |    9 ---------
 xmloff/source/core/facreg.cxx   |    3 ---
 xmloff/source/draw/sdxmlexp.cxx |    8 +++++++-
 xmloff/util/xo.component        |    3 ++-
 5 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit d7082ab8028e291ccbbdebe8e075d0a6e05af460
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed May 8 22:51:18 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu May 9 08:57:49 2019 +0200

    xmloff: create XMLImpressSettingsExportOasis instances with an uno constructor
    
    Change-Id: Ibe4ef82cf719afd008f1be23ed4a0e953c61d73f
    Reviewed-on: https://gerrit.libreoffice.org/72010
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 03e522b0f676..534089de57dc 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -260,6 +260,7 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
+    "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
 # xmlscript/util/xmlscript.component
     "com_sun_star_comp_xmlscript_XMLBasicExporter",
     "com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 5acd7cbc23ed..e7e410d69bd9 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -55,15 +55,6 @@ css::uno::Sequence<OUString> XMLImpressSettingsImportOasis_getSupportedServiceNa
 css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
-// impress oasis export
-OUString XMLImpressSettingsExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-
-// impress OOo import
-
 // impress OOo export
 OUString XMLImpressExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 68c2524d77f1..df87910883fc 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -62,9 +62,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
         else SINGLEFACTORY( XMLImpressMetaImportOasis )
         else SINGLEFACTORY( XMLImpressSettingsImportOasis )
 
-        // impress oasis export
-        else SINGLEFACTORY( XMLImpressSettingsExportOasis )
-
         else SINGLEFACTORY( AnimationsImport )
 
         // impress OOo export
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index c1ec00e33d77..2ee81abcf686 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2688,7 +2688,13 @@ com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation(
                                          SvXMLExportFlags::OASIS | SvXMLExportFlags::META));
 }
 
-SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressSettingsExportOasis", false,
+                                         SvXMLExportFlags::OASIS | 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( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", false, SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 02441b5d5961..10eb6618a126 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -127,7 +127,8 @@
   <implementation name="XMLImpressSettingsExportOOO">
     <service name="com.sun.star.comp.Impress.XMLSettingsExporter"/>
   </implementation>
-  <implementation name="XMLImpressSettingsExportOasis">
+  <implementation name="XMLImpressSettingsExportOasis"
+    constructor="com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/>
   </implementation>
   <implementation name="XMLImpressSettingsImportOasis">