ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

xmloff: create XMLDrawMetaExportOasis instances with an uno constructor

Browse Source 
See tdf#74608 for motivation.

Change-Id: I6dc4fcd75517c137c1bd4de766f67b73eaff1788
Reviewed-on: https://gerrit.libreoffice.org/81480
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna
2019-10-25 08:55:04 +02:00
parent 2c79de0a12
commit 98e92c2ca1
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solenv/bin/native-code.py
+1
View File
@@ -288,6 +288,7 @@ core_constructor_list = [
"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_XMLOasisMetaExporter_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",
xmloff/inc/facreg.hxx
-5
View File
@@ -47,11 +47,6 @@ css::uno::Sequence<OUString> XMLDrawContentExportOasis_getSupportedServiceNames(
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
OUString XMLDrawMetaExportOasis_getImplementationName() throw();
css::uno::Sequence<OUString> XMLDrawMetaExportOasis_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
// impress animation import
OUString AnimationsImport_getImplementationName() throw();
xmloff/source/core/facreg.cxx
-1
View File
@@ -60,7 +60,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
else SINGLEFACTORY( XMLDrawExportOasis )
else SINGLEFACTORY( XMLDrawStylesExportOasis )
else SINGLEFACTORY( XMLDrawContentExportOasis )
else SINGLEFACTORY( XMLDrawMetaExportOasis )
// drawing layer export
else SINGLEFACTORY( XMLDrawingLayerExport )
xmloff/source/draw/sdxmlexp.cxx
+8 -1
View File
@@ -2745,10 +2745,17 @@ com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation(
SvXMLExportFlags::OASIS | SvXMLExportFlags::SETTINGS));
}
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation(
uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawMetaExportOasis", true,
SvXMLExportFlags::OASIS | SvXMLExportFlags::META));
}
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( 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 );
xmloff/util/xo.component
+2 -1
View File
@@ -74,7 +74,8 @@
constructor="com_sun_star_comp_Draw_XMLMetaExporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLMetaExporter"/>
</implementation>
<implementation name="XMLDrawMetaExportOasis">
<implementation name="XMLDrawMetaExportOasis"
constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>
</implementation>
<implementation name="XMLDrawSettingsExportOOO"