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/sdxmlimp.cxx | 10 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
5 files changed, 12 insertions, 8 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 809782f97efa..f7858cdd49d4 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -272,6 +272,7 @@ core_constructor_list = [ "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation", + "com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation", "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation", diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index d9694e6fc276..8541b7842b17 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -39,11 +39,6 @@ css::uno::Sequence<OUString> XMLImpressStylesImportOasis_getSupportedServiceName /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> XMLImpressStylesImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString XMLImpressContentImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLImpressContentImportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLImpressContentImportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress OOo export OUString XMLImpressExportOOO_getImplementationName() throw(); diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 8a96b89b29e1..cba072106f97 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -58,7 +58,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi // impress oasis import SINGLEFACTORY( XMLImpressStylesImportOasis ) - else SINGLEFACTORY( XMLImpressContentImportOasis ) else SINGLEFACTORY( AnimationsImport ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index cf5616505789..98f23ab34b74 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -326,7 +326,15 @@ com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation( SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) -SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS ) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation( + uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLImport(pCtx, "XMLImpressContentImportOasis", false, + SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::CONTENT + | SvXMLImportFlags::SCRIPTS + | SvXMLImportFlags::FONTDECLS)); +} extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation( diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 72718cf09bf3..abf03a6e9dfc 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -103,7 +103,8 @@ constructor="com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLOasisContentImporter"/> </implementation> - <implementation name="XMLImpressContentImportOasis"> + <implementation name="XMLImpressContentImportOasis" + constructor="com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/> </implementation> <implementation name="XMLImpressExportOOO"> |