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

[Libreoffice Gerrit user]

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

New commits:
commit 50a73ae6ea3dca335df98b217982d8fe4d0d7a6c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Feb 21 16:41:33 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Feb 21 19:42:04 2019 +0100

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2b887fd20976..5887c0b3a5ce 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -255,6 +255,7 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisImporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation",
+    "com_sun_star_comp_Impress_XMLOasisContentExporter_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 07655681c146..60c49bfb3c75 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -56,11 +56,6 @@ css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createIn
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress oasis export
-OUString XMLImpressContentExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressContentExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString XMLImpressMetaExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 6488cd7f456e..1a8e929e835b 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -63,7 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
         else SINGLEFACTORY( XMLImpressSettingsImportOasis )
 
         // impress oasis export
-        else SINGLEFACTORY( XMLImpressContentExportOasis )
         else SINGLEFACTORY( XMLImpressMetaExportOasis )
         else SINGLEFACTORY( XMLImpressSettingsExportOasis )
 
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index f6f6640ae166..afd398a0eda5 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2672,7 +2672,16 @@ com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation(
             | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS));
 }
 
-SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressContentExportOasis", false,
+                                         SvXMLExportFlags::OASIS | SvXMLExportFlags::AUTOSTYLES
+                                             | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS
+                                             | SvXMLExportFlags::FONTDECLS));
+}
+
 SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
 SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
 
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index db037edd20a7..ec69df766a2d 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -94,7 +94,8 @@
   <implementation name="XMLImpressContentExportOOO">
     <service name="com.sun.star.comp.Impress.XMLContentExporter"/>
   </implementation>
-  <implementation name="XMLImpressContentExportOasis">
+  <implementation name="XMLImpressContentExportOasis"
+    constructor="com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/>
   </implementation>
   <implementation name="XMLImpressContentImportOasis">