ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

xmloff: create XMLImportSettingsImportOasis instances with an uno constructor

Browse Source 
See tdf#74608 for motivation.

Change-Id: I3e2afe5184f686180b287078477f095792c9ac12
Reviewed-on: https://gerrit.libreoffice.org/74384
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna
2019-06-20 09:02:58 +02:00
parent 1fcbab24c6
commit 7c19f35d60
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solenv/bin/native-code.py
+1
View File
@@ -267,6 +267,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_Impress_XMLOasisSettingsImporter_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
@@ -49,11 +49,6 @@ css::uno::Sequence<OUString> XMLImpressMetaImportOasis_getSupportedServiceNames(
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLImpressMetaImportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
OUString XMLImpressSettingsImportOasis_getImplementationName() throw();
css::uno::Sequence<OUString> XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
// impress OOo export
OUString XMLImpressExportOOO_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
SINGLEFACTORY( XMLImpressStylesImportOasis )
else SINGLEFACTORY( XMLImpressContentImportOasis )
else SINGLEFACTORY( XMLImpressMetaImportOasis )
else SINGLEFACTORY( XMLImpressSettingsImportOasis )
else SINGLEFACTORY( AnimationsImport )
xmloff/source/draw/sdxmlimp.cxx
+7 -1
View File
@@ -330,7 +330,13 @@ SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisConten
SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", false, SvXMLImportFlags::META )
SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS )
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation(
uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(
new SdXMLImport(pCtx, "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS));
}
SdXMLImport::SdXMLImport(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
xmloff/util/xo.component
+2 -1
View File
@@ -142,7 +142,8 @@
constructor="com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/>
</implementation>
<implementation name="XMLImpressSettingsImportOasis">
<implementation name="XMLImpressSettingsImportOasis"
constructor="com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation">
<service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/>
</implementation>
<implementation name="XMLImpressStylesExportOOO">