solenv/bin/native-code.py | 1 +
xmloff/inc/facreg.hxx | 5 -----
xmloff/source/core/facreg.cxx | 1 -
xmloff/source/draw/sdxmlimp.cxx | 7 ++++++-
xmloff/util/xo.component | 3 ++-
5 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit f897342320ad3a29cf4be1437c8e3ce888bdb3cb
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed May 15 22:15:59 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu May 16 09:07:10 2019 +0200
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 <vmik...@collabora.com>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8a9df2620715..833c85ac246d 100755
--- a/solenv/bin/native-code.py
+++ b/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",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index e7e410d69bd9..645446a046b5 100644
--- a/xmloff/inc/facreg.hxx
+++ b/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
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index df87910883fc..5f5e810e035d 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/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 )
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 22885511bd8e..7c661b56267d 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/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
)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 10eb6618a126..da91ef68bc99 100644
--- a/xmloff/util/xo.component
+++ b/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">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
