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/sdxmlexp.cxx | 10 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
5 files changed, 11 insertions, 13 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index c016e8afc71e..192fb0be7801 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -286,6 +286,7 @@ core_constructor_list = [ "com_sun_star_comp_Draw_XMLStylesExporter_get_implementation", "com_sun_star_comp_Draw_XMLContentExporter_get_implementation", "com_sun_star_comp_Draw_XMLMetaExporter_get_implementation", + "com_sun_star_comp_Draw_XMLSettingsExporter_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", diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index e068852ebbb3..242e6c0767ca 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -58,13 +58,6 @@ css::uno::Sequence<OUString> XMLDrawSettingsExportOasis_getSupportedServiceNames css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -// draw OOo export -OUString XMLDrawSettingsExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLDrawSettingsExportOOO_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOOO_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); - // impress animation import OUString AnimationsImport_getImplementationName() throw(); css::uno::Sequence<OUString> AnimationsImport_getSupportedServiceNames() throw(); diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 4646e12f14e9..293b1b3d9c98 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -63,9 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi else SINGLEFACTORY( XMLDrawMetaExportOasis ) else SINGLEFACTORY( XMLDrawSettingsExportOasis ) - // draw OOo export - else SINGLEFACTORY( XMLDrawSettingsExportOOO ) - // drawing layer export else SINGLEFACTORY( XMLDrawingLayerExport ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 744b3df54c6e..7cff2ef05666 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2733,14 +2733,20 @@ com_sun_star_comp_Draw_XMLMetaExporter_get_implementation(uno::XComponentContext new SdXMLExport(pCtx, "XMLDrawMetaExportOOO", true, SvXMLExportFlags::META)); } +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire( + new SdXMLExport(pCtx, "XMLDrawSettingsExportOOO", true, SvXMLExportFlags::SETTINGS)); +} + 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 ); SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS ); SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS ); SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::META ); SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS ); -SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", true, SvXMLExportFlags::SETTINGS ); - 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 ); diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 3c6e6e60583d..07888aeebb74 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -77,7 +77,8 @@ <implementation name="XMLDrawMetaExportOasis"> <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/> </implementation> - <implementation name="XMLDrawSettingsExportOOO"> + <implementation name="XMLDrawSettingsExportOOO" + constructor="com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLSettingsExporter"/> </implementation> <implementation name="XMLDrawSettingsExportOasis"> |