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 5537c283a766337ee7b128d6f7fab5dd56937489 Author: Miklos Vajna <[email protected]> AuthorDate: Wed Apr 24 21:12:32 2019 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Apr 25 09:04:43 2019 +0200 xmloff: create XMLImpressMetaExportOasis instances with an uno constructor Change-Id: I350c2c96cd178878ae687dd5214fcabfcf7675e7 Reviewed-on: https://gerrit.libreoffice.org/71254 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 78f12deee3f7..bf4fc822fdf5 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -259,6 +259,7 @@ core_constructor_list = [ "com_sun_star_comp_Impress_XMLOasisExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation", + "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation", # xmlscript/util/xmlscript.component "com_sun_star_comp_xmlscript_XMLBasicExporter", "com_sun_star_comp_xmlscript_XMLBasicImporter", diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index 60c49bfb3c75..5acd7cbc23ed 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 XMLImpressMetaExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLImpressMetaExportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLImpressMetaExportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); OUString XMLImpressSettingsExportOasis_getImplementationName() throw(); css::uno::Sequence<OUString> XMLImpressSettingsExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 1a8e929e835b..68c2524d77f1 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( XMLImpressMetaExportOasis ) else SINGLEFACTORY( XMLImpressSettingsExportOasis ) else SINGLEFACTORY( AnimationsImport ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 78312ff011c3..c1ec00e33d77 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2680,7 +2680,14 @@ com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation( | SvXMLExportFlags::FONTDECLS)); } -SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META ); +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressMetaExportOasis", false, + SvXMLExportFlags::OASIS | SvXMLExportFlags::META)); +} + SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS ); SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED ); diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index ec69df766a2d..02441b5d5961 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -116,7 +116,8 @@ <implementation name="XMLImpressMetaExportOOO"> <service name="com.sun.star.comp.Impress.XMLMetaExporter"/> </implementation> - <implementation name="XMLImpressMetaExportOasis"> + <implementation name="XMLImpressMetaExportOasis" + constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/> </implementation> <implementation name="XMLImpressMetaImportOasis"> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
