xmloff: create XMLImpressContentExportOasis instances with an uno constructor

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

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",

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

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 )
 

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 );
 

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">