summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-13 08:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-13 12:44:31 +0100
commita987aa3be73ec29917567d16886c017ac9a0a3d8 (patch)
tree6180d495af35b8a1bf34e955b0ea5e49ca2a355c /xmloff
parent6847deb1f7c68cf0402ccbc61c42ca5d285d3a61 (diff)
Make loplugin:salcall look into macros too
"Indirect" calls to isSallCallFunction (for canonic and overridden FunctionDecls) already needed to handle many cases of FunctionDecls spanning macros, so it isn't that much more work to make that also work for cases called directly from VisitFunctionDecl. Change-Id: I529f148c8872b86aa1ef082c6cb73db8ab1866e7 Reviewed-on: https://gerrit.libreoffice.org/46367 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx6
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx6
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx6
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.hxx162
4 files changed, 90 insertions, 90 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 53a8727fc87a..931667c57f1b 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2684,15 +2684,15 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
}
#define SERVICE( classname, servicename, implementationname, draw, flags )\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
{\
return uno::Sequence< OUString > { servicename };\
}\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
{\
return OUString( implementationname );\
}\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
{\
return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index ed2848036239..3d5e91ea814e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -235,15 +235,15 @@ SvXMLImportContextRef SdXMLFlatDocContext_Impl::CreateChildContext(
}
#define SERVICE(classname,servicename,implementationname,draw,flags)\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
{\
return uno::Sequence< OUString > { servicename };\
}\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
{\
return OUString( implementationname );\
}\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
{\
return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 6756fb50199d..7548ccbe5974 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -2004,19 +2004,19 @@ Reference< XInterface > OOo2OasisTransformer_createInstance(
}
#define OOO_IMPORTER( className, implName, subServiceName ) \
-OUString SAL_CALL className##_getImplementationName() throw() \
+OUString className##_getImplementationName() throw() \
{ \
return OUString( implName ); \
} \
\
-Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\
+Sequence< OUString > className##_getSupportedServiceNames() throw()\
{ \
const OUString aServiceName( className##_getImplementationName() ); \
const Sequence< OUString > aSeq( &aServiceName, 1 ); \
return aSeq; \
} \
\
-Reference< XInterface > SAL_CALL className##_createInstance( \
+Reference< XInterface > className##_createInstance( \
const Reference< XMultiServiceFactory > & ) \
{ \
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName, \
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 767bcfae4a7b..2baee48de757 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -34,166 +34,166 @@ css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() t
css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
+OUString XMLAutoTextEventImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLAutoTextEventImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMathSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLMathSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMathSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMathMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMathMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLMathMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMathMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMathMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
#endif