summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-12-05 21:13:12 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-12-06 08:50:13 +0100
commit6182f1053c1cf98fb3c7129e478e271ea1ee9977 (patch)
tree56755ea2e5a4d1dfbba6b8ca98b0b474527f17f1 /xmloff/source
parent6e70a98b15c97ad2a3714aae5a5bfa22d307f236 (diff)
xmloff: create XMLDrawExportOasis instances with an uno constructor
See tdf#74608 for motivation. Change-Id: Id8cad1ed02b5fee93184e17ebf80435c01aa3618 Reviewed-on: https://gerrit.libreoffice.org/84583 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/core/facreg.cxx3
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx12
2 files changed, 11 insertions, 4 deletions
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 97b7a2b71918..a6018bf06ed6 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -56,9 +56,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
SINGLEFACTORY( AnimationsImport )
- // draw oasis export
- else SINGLEFACTORY( XMLDrawExportOasis )
-
// drawing layer export
else SINGLEFACTORY( XMLDrawingLayerExport )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index e54af095a2e7..68854c836b68 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2772,7 +2772,17 @@ com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation(
| SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS));
}
-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 );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Draw_XMLOasisExporter_get_implementation(uno::XComponentContext* pCtx,
+ uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+ return cppu::acquire(new SdXMLExport(
+ pCtx, "XMLDrawExportOasis", true,
+ SvXMLExportFlags::OASIS | SvXMLExportFlags::META | SvXMLExportFlags::STYLES
+ | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES
+ | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::SETTINGS
+ | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::EMBEDDED));
+}
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 );