diff options
| -rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
| -rw-r--r-- | xmloff/inc/facreg.hxx | 7 | ||||
| -rw-r--r-- | xmloff/source/core/facreg.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 9 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 5 |
5 files changed, 13 insertions, 12 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 65930e3e8226..8773c5dc2bff 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -271,6 +271,7 @@ core_constructor_list = [ "com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisMetaImporter_get_implementation", + "com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation", # xmlscript/util/xmlscript.component "com_sun_star_comp_xmlscript_XMLBasicExporter", "com_sun_star_comp_xmlscript_XMLBasicImporter", diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index cd73d5ab96e3..bc49e6883df2 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -82,13 +82,6 @@ css::uno::Sequence<OUString> XMLImpressSettingsExportOOO_getSupportedServiceName css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -// draw oasis import -OUString XMLDrawSettingsImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLDrawSettingsImportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLDrawSettingsImportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); - // draw oasis export OUString XMLDrawExportOasis_getImplementationName() throw(); css::uno::Sequence<OUString> XMLDrawExportOasis_getSupportedServiceNames() throw(); diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index bb66eea938d9..289855108c7e 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -71,9 +71,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi else SINGLEFACTORY( XMLImpressMetaExportOOO ) else SINGLEFACTORY( XMLImpressSettingsExportOOO ) - // draw oasis import - else SINGLEFACTORY( XMLDrawSettingsImportOasis ) - // draw oasis export else SINGLEFACTORY( XMLDrawExportOasis ) else SINGLEFACTORY( XMLDrawStylesExportOasis ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index b7720ad4cd61..9e170db28ddd 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -316,6 +316,14 @@ com_sun_star_comp_Draw_XMLOasisMetaImporter_get_implementation( new SdXMLImport(pCtx, "XMLDrawMetaImportOasis", true, SvXMLImportFlags::META)); } +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire( + new SdXMLImport(pCtx, "XMLDrawSettingsImportOasis", true, SvXMLImportFlags::SETTINGS)); +} + SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS ) @@ -323,7 +331,6 @@ 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 ) -SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS ) SdXMLImport::SdXMLImport( const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 2c96a6971e99..0c0ff1976510 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -138,8 +138,11 @@ constructor="com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/> </implementation> - <implementation name="XMLImpressSettingsImportOasis"> + <implementation name="XMLDrawSettingsImportOasis" + constructor="com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/> + </implementation> + <implementation name="XMLImpressSettingsImportOasis"> <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/> </implementation> <implementation name="XMLImpressStylesExportOOO"> |