xmloff: create XMLDrawImportOasis instances with an uno constructor

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

solenv/bin/native-code.py

@@ -261,6 +261,7 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
+    "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
 # xmlscript/util/xmlscript.component
     "com_sun_star_comp_xmlscript_XMLBasicExporter",
     "com_sun_star_comp_xmlscript_XMLBasicImporter",

xmloff/inc/facreg.hxx

@@ -83,11 +83,6 @@ css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInst
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis import
-OUString XMLDrawImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLDrawImportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLDrawImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString XMLDrawStylesImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception

xmloff/source/core/facreg.cxx

@@ -72,7 +72,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
         else SINGLEFACTORY( XMLImpressSettingsExportOOO )
 
         // draw oasis import
-        else SINGLEFACTORY( XMLDrawImportOasis )
         else SINGLEFACTORY( XMLDrawStylesImportOasis )
         else SINGLEFACTORY( XMLDrawContentImportOasis )
         else SINGLEFACTORY( XMLDrawMetaImportOasis )

xmloff/source/draw/sdxmlimp.cxx

@@ -281,7 +281,12 @@ com_sun_star_comp_Impress_XMLOasisImporter_get_implementation(
         new SdXMLImport(pCtx, "XMLImpressImportOasis", false, SvXMLImportFlags::ALL));
 }
 
-SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", true, SvXMLImportFlags::ALL )
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Draw_XMLOasisImporter_get_implementation(uno::XComponentContext* pCtx,
+                                                           uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawImportOasis", true, SvXMLImportFlags::ALL));
+}
 
 SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES )
 SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", true, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES )

xmloff/util/xo.component

@@ -64,7 +64,8 @@
   <implementation name="XMLDrawExportOasis">
     <service name="com.sun.star.comp.Draw.XMLOasisExporter"/>
   </implementation>
-  <implementation name="XMLDrawImportOasis">
+  <implementation name="XMLDrawImportOasis"
+    constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisImporter"/>
   </implementation>
   <implementation name="XMLDrawMetaExportOOO">