[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           |    7 -------
 xmloff/source/core/facreg.cxx   |    3 ---
 xmloff/source/draw/sdxmlexp.cxx |   12 +++++++++++-
 xmloff/util/xo.component        |    3 ++-
 5 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 95ada3e44b7e52f7545a152278244b99e8340627
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Aug 28 21:14:06 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Aug 29 09:00:12 2019 +0200

    xmloff: create XMLImpressExportOOO instances with an uno constructor
    
    See tdf#74608 for motivation.
    
    Change-Id: I44c3ac24c19f4ecd1d0d01a9a686b486f3b35c48
    Reviewed-on: https://gerrit.libreoffice.org/78236
    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 45a3fee13118..cff16c954cd6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -280,6 +280,7 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLContentExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLMetaExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation",
+    "com_sun_star_comp_Impress_XMLExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 610c4d85b949..bef148811eaa 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -33,13 +33,6 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XInterface; }
 } } }
 
-// impress OOo export
-OUString XMLImpressExportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-
 // draw oasis export
 OUString XMLDrawExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> XMLDrawExportOasis_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index ad84f7f0aece..f25c4262a477 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -58,9 +58,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
 
         SINGLEFACTORY( AnimationsImport )
 
-        // impress OOo export
-        else SINGLEFACTORY( XMLImpressExportOOO )
-
         // draw oasis export
         else SINGLEFACTORY( XMLDrawExportOasis )
         else SINGLEFACTORY( XMLDrawStylesExportOasis )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index b2c35150323e..c271f26b78db 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2693,7 +2693,17 @@ com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation(
         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 );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLExporter_get_implementation(uno::XComponentContext* pCtx,
+                                                         uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLExport(
+        pCtx, "XMLImpressExportOOO", false,
+        SvXMLExportFlags::META | SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES
+            | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS
+            | SvXMLExportFlags::SETTINGS | SvXMLExportFlags::FONTDECLS
+            | SvXMLExportFlags::EMBEDDED));
+}
 
 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 7c97cf2275ec..1dad34ddd4ff 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -108,7 +108,8 @@
     constructor="com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/>
   </implementation>
-  <implementation name="XMLImpressExportOOO">
+  <implementation name="XMLImpressExportOOO"
+    constructor="com_sun_star_comp_Impress_XMLExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLExporter"/>
   </implementation>
   <implementation name="XMLImpressExportOasis"