summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/facreg.hxx5
-rw-r--r--xmloff/source/core/facreg.cxx1
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx8
-rw-r--r--xmloff/util/xo.component3
4 files changed, 9 insertions, 8 deletions
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index bc49e6883df2..d3a6317a6775 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -49,11 +49,6 @@ css::uno::Sequence<OUString> XMLImpressMetaImportOasis_getSupportedServiceNames(
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> XMLImpressMetaImportOasis_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-OUString XMLImpressSettingsImportOasis_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_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 289855108c7e..6e34f4ef64d2 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
SINGLEFACTORY( XMLImpressStylesImportOasis )
else SINGLEFACTORY( XMLImpressContentImportOasis )
else SINGLEFACTORY( XMLImpressMetaImportOasis )
- else SINGLEFACTORY( XMLImpressSettingsImportOasis )
else SINGLEFACTORY( AnimationsImport )
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 9e170db28ddd..d11c4877b6ee 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -330,7 +330,13 @@ SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisConten
SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", false, SvXMLImportFlags::META )
-SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS )
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation(
+ uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+ return cppu::acquire(
+ new SdXMLImport(pCtx, "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS));
+}
SdXMLImport::SdXMLImport(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 0c0ff1976510..5fb27d791ba8 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -142,7 +142,8 @@
constructor="com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/>
</implementation>
- <implementation name="XMLImpressSettingsImportOasis">
+ <implementation name="XMLImpressSettingsImportOasis"
+ constructor="com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation">
<service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/>
</implementation>
<implementation name="XMLImpressStylesExportOOO">