From bd824be5371d5e4d6e49b72ccf01897ba301c55e Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Thu, 7 Feb 2019 21:40:54 +0100
Subject: xmloff: create XMLImpressExportOasis instances with an uno
 constructor

Change-Id: I58c689f5a1b034f64687031e24b82a3ac56e4bae
Reviewed-on: https://gerrit.libreoffice.org/67519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 xmloff/inc/facreg.hxx           |  5 -----
 xmloff/source/core/facreg.cxx   |  1 -
 xmloff/source/draw/sdxmlexp.cxx | 13 ++++++++++++-
 xmloff/util/xo.component        |  3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index aa30d961c4d1..c48af506ca8a 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 XMLImpressExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString XMLImpressStylesExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 9d9bd88e59f3..329967efd696 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( XMLImpressExportOasis )
         else SINGLEFACTORY( XMLImpressStylesExportOasis )
         else SINGLEFACTORY( XMLImpressContentExportOasis )
         else SINGLEFACTORY( XMLImpressMetaExportOasis )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 58324bb90383..529aabcb4a3e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2650,7 +2650,18 @@ uno::Reference< uno::XInterface > classname##_createInstance(const uno::Referenc
     return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
 }
 
-SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, SvXMLExportFlags::OASIS|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_XMLOasisExporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLExport(
+        pCtx, "XMLImpressExportOasis", false,
+        SvXMLExportFlags::OASIS | SvXMLExportFlags::META | SvXMLExportFlags::STYLES
+            | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES
+            | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::SETTINGS
+            | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::EMBEDDED));
+}
+
 SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
 SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "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 );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 75d33db263c7..fe88914cdc88 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -104,7 +104,8 @@
   <implementation name="XMLImpressExportOOO">
     <service name="com.sun.star.comp.Impress.XMLExporter"/>
   </implementation>
-  <implementation name="XMLImpressExportOasis">
+  <implementation name="XMLImpressExportOasis"
+    constructor="com_sun_star_comp_Impress_XMLOasisExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisExporter"/>
   </implementation>
   <implementation name="XMLImpressImportOasis"
-- 
cgit