summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx26
-rw-r--r--xmloff/source/core/facreg.cxx3
2 files changed, 11 insertions, 18 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 4344d6187b5e..7b3884933e1c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3768,22 +3768,16 @@ Reference< uno::XInterface > SchXMLExport_createInstance(const Reference< lang::
}
// Oasis format
-Sequence< OUString > SchXMLExport_Oasis_getSupportedServiceNames() throw()
-{
- return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisExporter" };
-}
-
-OUString SchXMLExport_Oasis_getImplementationName() throw()
-{
- return "SchXMLExport.Oasis.Compact";
-}
-
-Reference< uno::XInterface > SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
-{
- // #103997# removed some flags from EXPORT_ALL
- return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr),
- SchXMLExport_Oasis_getImplementationName(),
- (SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )) | SvXMLExportFlags::OASIS ));
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Chart_XMLOasisExporter_get_implementation(uno::XComponentContext* pCtx,
+ uno::Sequence<uno::Any> const& /*rSeq*/)
+{
+ return cppu::acquire(
+ new SchXMLExport(pCtx, "SchXMLExport.Oasis.Compact",
+ (SvXMLExportFlags::ALL
+ ^ (SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES
+ | SvXMLExportFlags::SCRIPTS))
+ | SvXMLExportFlags::OASIS));
}
// multiple storage version: one for content / styles / meta
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 02e570e25832..207ac7c1fd83 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -55,8 +55,7 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const char * pImplName, void *
const sal_Int32 nImplNameLen = strlen( pImplName );
// chart oasis export
- SINGLEFACTORY( SchXMLExport_Oasis )
- else SINGLEFACTORY( SchXMLExport_Oasis_Meta )
+ SINGLEFACTORY( SchXMLExport_Oasis_Meta )
else SINGLEFACTORY( SchXMLExport_Oasis_Styles )
else SINGLEFACTORY( SchXMLExport_Oasis_Content )