Kaydet (Commit) 5537c283 authored tarafından Miklos Vajna's avatar Miklos Vajna

xmloff: create XMLImpressMetaExportOasis instances with an uno constructor

Change-Id: I350c2c96cd178878ae687dd5214fcabfcf7675e7
Reviewed-on: https://gerrit.libreoffice.org/71254
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst fad98c86
......@@ -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",
......
......@@ -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
......
......@@ -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 )
......
......@@ -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 );
......
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment