diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-07-17 21:34:58 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-18 09:08:05 +0200 |
| commit | 955871e42d79903205cb0eeb7d82c6bb4d397ec1 (patch) | |
| tree | 28c33cede292e5afa6dec63b3a24618b34800272 /xmloff/source | |
| parent | 2a6d510b5bb1503ae12e5ccc921b0ab7032c8e65 (diff) | |
xmloff: create XMLImportContentImportOasis instances with an uno constructor
See tdf#74608 for motivation.
Change-Id: I3b52830ece6fae82af1bc57eb93e3a9ad1eb2aff
Reviewed-on: https://gerrit.libreoffice.org/75809
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/core/facreg.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 10 |
2 files changed, 9 insertions, 2 deletions
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( |