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 32aebf3e0baf..e3d6f5be6238 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -277,6 +277,7 @@ core_constructor_list = [ "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation", "com_sun_star_comp_Impress_XMLStylesExporter_get_implementation", + "com_sun_star_comp_Impress_XMLContentExporter_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 e96ed09d04af..83705cef2e65 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -39,11 +39,6 @@ css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() thro /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> XMLImpressExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString XMLImpressContentExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLImpressContentExportOOO_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOOO_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); OUString XMLImpressMetaExportOOO_getImplementationName() throw(); css::uno::Sequence<OUString> XMLImpressMetaExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 38d5cfb29ac5..14f0764d5215 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -60,7 +60,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi // impress OOo export else SINGLEFACTORY( XMLImpressExportOOO ) - else SINGLEFACTORY( XMLImpressContentExportOOO ) else SINGLEFACTORY( XMLImpressMetaExportOOO ) else SINGLEFACTORY( XMLImpressSettingsExportOOO ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 017eebeb0a12..3b58e8468328 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2667,8 +2667,17 @@ com_sun_star_comp_Impress_XMLStylesExporter_get_implementation( | SvXMLExportFlags::FONTDECLS)); } +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Impress_XMLContentExporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressContentExportOOO", false, + SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT + | SvXMLExportFlags::SCRIPTS + | SvXMLExportFlags::FONTDECLS)); +} + SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED ); -SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", false, SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS ); SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", false, SvXMLExportFlags::META ); SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, SvXMLExportFlags::SETTINGS ); diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 69fc7c5b1845..3cf27c8c4753 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -92,7 +92,8 @@ <implementation name="XMLImpressClipboardExport"> <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/> </implementation> - <implementation name="XMLImpressContentExportOOO"> + <implementation name="XMLImpressContentExportOOO" + constructor="com_sun_star_comp_Impress_XMLContentExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLContentExporter"/> </implementation> <implementation name="XMLImpressContentExportOasis" |