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 | 11 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
5 files changed, 13 insertions, 8 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 09b4b50712af..748f7310f4f6 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -288,6 +288,7 @@ core_constructor_list = [ "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation", + "com_sun_star_comp_Draw_XMLOasisContentExporter_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 fd83f98901f3..4b00425996b9 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -42,11 +42,6 @@ css::uno::Sequence<OUString> XMLDrawStylesExportOasis_getSupportedServiceNames() /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> XMLDrawStylesExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString XMLDrawContentExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLDrawContentExportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress animation import OUString AnimationsImport_getImplementationName() throw(); diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 401c19d50c83..875e3df0ee46 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -59,7 +59,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi // draw oasis export else SINGLEFACTORY( XMLDrawExportOasis ) else SINGLEFACTORY( XMLDrawStylesExportOasis ) - else SINGLEFACTORY( XMLDrawContentExportOasis ) // drawing layer export else SINGLEFACTORY( XMLDrawingLayerExport ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 44c9afee02fd..ca706a5c3e5e 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2752,9 +2752,18 @@ com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation( SvXMLExportFlags::OASIS | SvXMLExportFlags::META)); } +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawContentExportOasis", true, + SvXMLExportFlags::OASIS | SvXMLExportFlags::AUTOSTYLES + | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS + | SvXMLExportFlags::FONTDECLS)); +} + 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( 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 fcc5085a89c6..ee4dd77f78c7 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -56,7 +56,8 @@ constructor="com_sun_star_comp_Draw_XMLContentExporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLContentExporter"/> </implementation> - <implementation name="XMLDrawContentExportOasis"> + <implementation name="XMLDrawContentExportOasis" + constructor="com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/> </implementation> <implementation name="XMLDrawExportOOO" |