mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmloff: create XMLDrawStylesImportOasis instances with an uno constructor

Browse Source 
Change-Id: I677c3b184e225c3bac1c56efd5ea46aaa2497d69
Reviewed-on: https://gerrit.libreoffice.org/72810
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna
2019-05-22 21:27:35 +02:00
parent b18ee08274
commit e061e0fc38
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/bin/native-code.py
View File

@@ -262,6 +262,7 @@ core_constructor_list = [
"com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
"com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
"com_sun_star_comp_Draw_XMLOasisImporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
"com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation",
# xmlscript/util/xmlscript.component # xmlscript/util/xmlscript.component
"com_sun_star_comp_xmlscript_XMLBasicExporter", "com_sun_star_comp_xmlscript_XMLBasicExporter",
"com_sun_star_comp_xmlscript_XMLBasicImporter", "com_sun_star_comp_xmlscript_XMLBasicImporter",

5
xmloff/inc/facreg.hxx
View File

@@ -83,11 +83,6 @@ css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInst
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
// draw oasis import // draw oasis import
OUString XMLDrawStylesImportOasis_getImplementationName() throw();
css::uno::Sequence<OUString> XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLDrawStylesImportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
OUString XMLDrawContentImportOasis_getImplementationName() throw(); OUString XMLDrawContentImportOasis_getImplementationName() throw();
css::uno::Sequence<OUString> XMLDrawContentImportOasis_getSupportedServiceNames() throw(); css::uno::Sequence<OUString> XMLDrawContentImportOasis_getSupportedServiceNames() throw();
/// @throws css::uno::Exception /// @throws css::uno::Exception

1
xmloff/source/core/facreg.cxx
View File

@@ -72,7 +72,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi
else SINGLEFACTORY( XMLImpressSettingsExportOOO ) else SINGLEFACTORY( XMLImpressSettingsExportOOO )
// draw oasis import // draw oasis import
else SINGLEFACTORY( XMLDrawStylesImportOasis )
else SINGLEFACTORY( XMLDrawContentImportOasis ) else SINGLEFACTORY( XMLDrawContentImportOasis )
else SINGLEFACTORY( XMLDrawMetaImportOasis ) else SINGLEFACTORY( XMLDrawMetaImportOasis )
else SINGLEFACTORY( XMLDrawSettingsImportOasis ) else SINGLEFACTORY( XMLDrawSettingsImportOasis )

10
xmloff/source/draw/sdxmlimp.cxx
View File

@@ -288,8 +288,16 @@ com_sun_star_comp_Draw_XMLOasisImporter_get_implementation(uno::XComponentContex
return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawImportOasis", true, SvXMLImportFlags::ALL)); return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawImportOasis", true, SvXMLImportFlags::ALL));
} }
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation(uno::XComponentContext* pCtx,
uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawStylesImportOasis", true,
SvXMLImportFlags::STYLES | SvXMLImportFlags::AUTOSTYLES
| SvXMLImportFlags::MASTERSTYLES));
}
SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) 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 )
SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS ) SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS )
SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", true, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS ) SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", true, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS )

5
xmloff/util/xo.component
View File

@@ -144,9 +144,12 @@
<service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/> <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/>
</implementation> </implementation>
<implementation name="XMLImpressStylesImportOasis"> <implementation name="XMLImpressStylesImportOasis">
<service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
<service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/> <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/>
</implementation> </implementation>
<implementation name="XMLDrawStylesImportOasis"
constructor="com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
</implementation>
<implementation name="XMLMetaExportComponent" <implementation name="XMLMetaExportComponent"
constructor="XMLMetaExportComponent_get_implementation"> constructor="XMLMetaExportComponent_get_implementation">
<service name="com.sun.star.document.XMLOasisMetaExporter"/> <service name="com.sun.star.document.XMLOasisMetaExporter"/>