diff options
Diffstat (limited to 'xmloff')
| -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 |
4 files changed, 12 insertions, 8 deletions
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index c48af506ca8a..07655681c146 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -56,11 +56,6 @@ css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createIn css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress oasis export -OUString XMLImpressStylesExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLImpressStylesExportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLImpressStylesExportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); OUString XMLImpressContentExportOasis_getImplementationName() throw(); css::uno::Sequence<OUString> XMLImpressContentExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 329967efd696..6488cd7f456e 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -63,7 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi else SINGLEFACTORY( XMLImpressSettingsImportOasis ) // impress oasis export - else SINGLEFACTORY( XMLImpressStylesExportOasis ) else SINGLEFACTORY( XMLImpressContentExportOasis ) else SINGLEFACTORY( XMLImpressMetaExportOasis ) else SINGLEFACTORY( XMLImpressSettingsExportOasis ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 41dc67caea15..f6f6640ae166 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2662,7 +2662,16 @@ com_sun_star_comp_Impress_XMLOasisExporter_get_implementation( | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::EMBEDDED)); } -SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS ); +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLExport( + pCtx, "XMLImpressStylesExportOasis", false, + SvXMLExportFlags::OASIS | SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES + | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); +} + SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS ); SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META ); SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS ); diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index fe88914cdc88..db037edd20a7 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -135,7 +135,8 @@ <implementation name="XMLImpressStylesExportOOO"> <service name="com.sun.star.comp.Impress.XMLStylesExporter"/> </implementation> - <implementation name="XMLImpressStylesExportOasis"> + <implementation name="XMLImpressStylesExportOasis" + constructor="com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/> </implementation> <implementation name="XMLImpressStylesImportOasis"> |