diff options
| -rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
| -rw-r--r-- | xmloff/inc/facreg.hxx | 5 | ||||
| -rw-r--r-- | xmloff/source/core/facreg.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 9 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
5 files changed, 11 insertions, 8 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 0991a93a4626..493a23beab74 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -284,6 +284,7 @@ core_constructor_list = [ "com_sun_star_comp_Draw_XMLExporter_get_implementation", "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_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 906cf50c0751..e068852ebbb3 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -59,11 +59,6 @@ css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOasis_createInsta css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // draw OOo export -OUString XMLDrawMetaExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLDrawMetaExportOOO_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOOO_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); OUString XMLDrawSettingsExportOOO_getImplementationName() throw(); css::uno::Sequence<OUString> XMLDrawSettingsExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 6e1a5bf48cad..4646e12f14e9 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -64,7 +64,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi else SINGLEFACTORY( XMLDrawSettingsExportOasis ) // draw OOo export - else SINGLEFACTORY( XMLDrawMetaExportOOO ) else SINGLEFACTORY( XMLDrawSettingsExportOOO ) // drawing layer export diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index baf552c8ca10..744b3df54c6e 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2725,13 +2725,20 @@ com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentCont | SvXMLExportFlags::FONTDECLS)); } +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Draw_XMLMetaExporter_get_implementation(uno::XComponentContext* pCtx, + uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire( + new SdXMLExport(pCtx, "XMLDrawMetaExportOOO", true, SvXMLExportFlags::META)); +} + 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( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", true, SvXMLExportFlags::META ); 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 ); diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 8a81b5f42045..3c6e6e60583d 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -70,7 +70,8 @@ constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLOasisImporter"/> </implementation> - <implementation name="XMLDrawMetaExportOOO"> + <implementation name="XMLDrawMetaExportOOO" + constructor="com_sun_star_comp_Draw_XMLMetaExporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLMetaExporter"/> </implementation> <implementation name="XMLDrawMetaExportOasis"> |