[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/sdxmlexp.cxx |    9 ++++++++-
 xmloff/util/xo.component        |    3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 90492bfbc3a2708a972233d90966594b1438c250
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Oct 17 21:02:46 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Oct 18 08:39:56 2019 +0200

    xmloff: create XMLDrawSettingsExportOasis instances with an uno constructor
    
    See tdf#74608 for motivation.
    
    Change-Id: I25fbd841a8f91b51787cebd4b94f5a62cb0d9e07
    Reviewed-on: https://gerrit.libreoffice.org/80996
    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 0b6b1f0a74f5..9e9640583ce0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -287,6 +287,7 @@ core_constructor_list = [
     "com_sun_star_comp_Draw_XMLContentExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLMetaExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
+    "com_sun_star_comp_Draw_XMLOasisSettingsExporter_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 242e6c0767ca..e46bee747c30 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -52,11 +52,6 @@ css::uno::Sequence<OUString> XMLDrawMetaExportOasis_getSupportedServiceNames() t
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOasis_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString XMLDrawSettingsExportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress animation import
 OUString AnimationsImport_getImplementationName() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 293b1b3d9c98..5944a8e9cc0f 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -61,7 +61,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
         else SINGLEFACTORY( XMLDrawStylesExportOasis )
         else SINGLEFACTORY( XMLDrawContentExportOasis )
         else SINGLEFACTORY( XMLDrawMetaExportOasis )
-        else SINGLEFACTORY( XMLDrawSettingsExportOasis )
 
         // drawing layer export
         else SINGLEFACTORY( XMLDrawingLayerExport )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 7fa2fa86c315..dadfeadb1331 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2737,11 +2737,18 @@ com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation(
         new SdXMLExport(pCtx, "XMLDrawSettingsExportOOO", true, SvXMLExportFlags::SETTINGS));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation(
+    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+    return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawSettingsExportOasis", true,
+                                         SvXMLExportFlags::OASIS | SvXMLExportFlags::SETTINGS));
+}
+
 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 );
 SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
 SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
-SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
 
 SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
 SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 07888aeebb74..658769da4bd8 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -81,7 +81,8 @@
     constructor="com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLSettingsExporter"/>
   </implementation>
-  <implementation name="XMLDrawSettingsExportOasis">
+  <implementation name="XMLDrawSettingsExportOasis"
+    constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
   </implementation>
   <implementation name="XMLDrawStylesExportOOO"