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

New commits:
commit 405c4e37b2ddf3afeda5e4bf9f57a3c9dd5eab85
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jul 3 21:16:33 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jul 4 09:03:05 2019 +0200

    xmloff: create XMLImportMetaImportOasis instances with an uno constructor
    
    See tdf#74608 for motivation.
    
    Change-Id: Iaa42d09df5322e8fb23d96e7ff2c298951684c6c
    Reviewed-on: https://gerrit.libreoffice.org/75058
    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 ae758442569b..57d1b1e7a074 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -271,6 +271,7 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
+    "com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementatio",
     "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index d3a6317a6775..d9694e6fc276 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -44,11 +44,6 @@ css::uno::Sequence<OUString> XMLImpressContentImportOasis_getSupportedServiceNam
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> XMLImpressContentImportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString XMLImpressMetaImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressMetaImportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressMetaImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress OOo export
 OUString XMLImpressExportOOO_getImplementationName() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 6e34f4ef64d2..8a96b89b29e1 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -59,7 +59,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
         // impress oasis import
         SINGLEFACTORY( XMLImpressStylesImportOasis )
         else SINGLEFACTORY( XMLImpressContentImportOasis )
-        else SINGLEFACTORY( XMLImpressMetaImportOasis )
 
         else SINGLEFACTORY( AnimationsImport )
 
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index d11c4877b6ee..cf5616505789 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -328,7 +328,13 @@ SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesI
 
 SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS )
 
-SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", false, SvXMLImportFlags::META )
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(
+        new SdXMLImport(pCtx, "XMLImpressMetaImportOasis", false, SvXMLImportFlags::META));
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation(
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 5fb27d791ba8..72718cf09bf3 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -128,7 +128,8 @@
     constructor="com_sun_star_comp_Draw_XMLOasisMetaImporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisMetaImporter"/>
   </implementation>
-  <implementation name="XMLImpressMetaImportOasis">
+  <implementation name="XMLImpressMetaImportOasis"
+    constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
   </implementation>
   <implementation name="XMLImpressSettingsExportOOO">