diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-15 22:15:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-16 09:07:10 +0200 |
| commit | f897342320ad3a29cf4be1437c8e3ce888bdb3cb (patch) | |
| tree | 940972713c89905b16c614b894bbfa173608f102 /xmloff | |
| parent | 48ee3cce67d028d6e6e97405f6add22a80a3fc98 (diff) | |
xmloff: create XMLDrawImportOasis instances with an uno constructor
Change-Id: I4e4e0b56306a6e0e1b61f432e487a47d700e5e9f
Reviewed-on: https://gerrit.libreoffice.org/72379
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
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/sdxmlimp.cxx | 7 | ||||
| -rw-r--r-- | xmloff/util/xo.component | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index e7e410d69bd9..645446a046b5 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -83,11 +83,6 @@ css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInst css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // draw oasis import -OUString XMLDrawImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> XMLDrawImportOasis_getSupportedServiceNames() throw(); -/// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> XMLDrawImportOasis_createInstance( - css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); OUString XMLDrawStylesImportOasis_getImplementationName() throw(); css::uno::Sequence<OUString> XMLDrawStylesImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index df87910883fc..5f5e810e035d 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -72,7 +72,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, voi else SINGLEFACTORY( XMLImpressSettingsExportOOO ) // draw oasis import - else SINGLEFACTORY( XMLDrawImportOasis ) else SINGLEFACTORY( XMLDrawStylesImportOasis ) else SINGLEFACTORY( XMLDrawContentImportOasis ) else SINGLEFACTORY( XMLDrawMetaImportOasis ) diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 22885511bd8e..7c661b56267d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -281,7 +281,12 @@ com_sun_star_comp_Impress_XMLOasisImporter_get_implementation( new SdXMLImport(pCtx, "XMLImpressImportOasis", false, SvXMLImportFlags::ALL)); } -SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", true, SvXMLImportFlags::ALL ) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Draw_XMLOasisImporter_get_implementation(uno::XComponentContext* pCtx, + uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SdXMLImport(pCtx, "XMLDrawImportOasis", true, SvXMLImportFlags::ALL)); +} SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", true, SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES ) diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 10eb6618a126..da91ef68bc99 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -64,7 +64,8 @@ <implementation name="XMLDrawExportOasis"> <service name="com.sun.star.comp.Draw.XMLOasisExporter"/> </implementation> - <implementation name="XMLDrawImportOasis"> + <implementation name="XMLDrawImportOasis" + constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation"> <service name="com.sun.star.comp.Draw.XMLOasisImporter"/> </implementation> <implementation name="XMLDrawMetaExportOOO"> |