summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
Diffstat (limited to 'oox')
-rw-r--r--oox/inc/services.hxx42
-rw-r--r--oox/source/core/fasttokenhandler.cxx6
-rw-r--r--oox/source/core/filterdetect.cxx2
-rw-r--r--oox/source/core/services.cxx2
-rw-r--r--oox/source/docprop/ooxmldocpropimport.cxx6
-rw-r--r--oox/source/ppt/dgmimport.cxx6
-rw-r--r--oox/source/ppt/dgmlayout.cxx6
-rw-r--r--oox/source/ppt/pptimport.cxx6
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx6
9 files changed, 41 insertions, 41 deletions
diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx
index ae57c562839e..59e490ad5f43 100644
--- a/oox/inc/services.hxx
+++ b/oox/inc/services.hxx
@@ -24,52 +24,52 @@
namespace oox {
namespace core {
- extern OUString SAL_CALL FastTokenHandler_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames();
+ extern OUString FastTokenHandler_getImplementationName();
+ extern css::uno::Sequence< OUString > FastTokenHandler_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL FastTokenHandler_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > FastTokenHandler_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace core {
- extern OUString SAL_CALL FilterDetect_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames();
+ extern OUString FilterDetect_getImplementationName();
+ extern css::uno::Sequence< OUString > FilterDetect_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL FilterDetect_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > FilterDetect_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace docprop {
- extern OUString SAL_CALL DocumentPropertiesImport_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames();
+ extern OUString DocumentPropertiesImport_getImplementationName();
+ extern css::uno::Sequence< OUString > DocumentPropertiesImport_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentPropertiesImport_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > DocumentPropertiesImport_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace ppt {
- extern OUString SAL_CALL PowerPointImport_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames();
+ extern OUString PowerPointImport_getImplementationName();
+ extern css::uno::Sequence< OUString > PowerPointImport_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL PowerPointImport_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > PowerPointImport_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace ppt {
- extern OUString SAL_CALL QuickDiagrammingImport_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames();
+ extern OUString QuickDiagrammingImport_getImplementationName();
+ extern css::uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > QuickDiagrammingImport_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace ppt {
- extern OUString SAL_CALL QuickDiagrammingLayout_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames();
+ extern OUString QuickDiagrammingLayout_getImplementationName();
+ extern css::uno::Sequence< OUString > QuickDiagrammingLayout_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > QuickDiagrammingLayout_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace shape {
- extern OUString SAL_CALL ShapeContextHandler_getImplementationName();
- extern css::uno::Sequence< OUString > SAL_CALL ShapeContextHandler_getSupportedServiceNames();
+ extern OUString ShapeContextHandler_getImplementationName();
+ extern css::uno::Sequence< OUString > ShapeContextHandler_getSupportedServiceNames();
/// @throws css::uno::Exception
- extern css::uno::Reference< css::uno::XInterface > SAL_CALL ShapeContextHandler_createInstance(
+ extern css::uno::Reference< css::uno::XInterface > ShapeContextHandler_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
}
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index ee03144e2e9e..7709c6c5a25a 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -31,18 +31,18 @@ namespace core {
using namespace ::com::sun::star::uno;
-OUString SAL_CALL FastTokenHandler_getImplementationName()
+OUString FastTokenHandler_getImplementationName()
{
return OUString( "com.sun.star.comp.oox.core.FastTokenHandler" );
}
-Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames()
+Sequence< OUString > FastTokenHandler_getSupportedServiceNames()
{
Sequence<OUString> aServiceNames { "com.sun.star.xml.sax.FastTokenHandler" };
return aServiceNames;
}
-Reference< XInterface > SAL_CALL FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ )
+Reference< XInterface > FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ )
{
return static_cast< ::cppu::OWeakObject* >( new FastTokenHandler );
}
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 7bdd167fc922..1af982c07480 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -242,7 +242,7 @@ OUString FilterDetect_getImplementationName()
}
/* Helper for registry */
-Reference< XInterface > SAL_CALL FilterDetect_createInstance( const Reference< XComponentContext >& rxContext )
+Reference< XInterface > FilterDetect_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast< ::cppu::OWeakObject* >( new FilterDetect( rxContext ) );
}
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 9c9bcc3cea5a..85489f2bca6a 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -49,7 +49,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT void* oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
}
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 057765f3ebc9..a15518b2eb75 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -44,18 +44,18 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-OUString SAL_CALL DocumentPropertiesImport_getImplementationName()
+OUString DocumentPropertiesImport_getImplementationName()
{
return OUString( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" );
}
-Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames()
+Sequence< OUString > DocumentPropertiesImport_getSupportedServiceNames()
{
Sequence<OUString> aServices { "com.sun.star.document.OOXMLDocumentPropertiesImporter" };
return aServices;
}
-Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext )
+Reference< XInterface > DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast< ::cppu::OWeakObject* >( new DocumentPropertiesImport( rxContext ) );
}
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index c9eb30a158cd..c10dc48a72ef 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -36,19 +36,19 @@ using namespace oox::core;
namespace oox { namespace ppt {
-OUString SAL_CALL QuickDiagrammingImport_getImplementationName()
+OUString QuickDiagrammingImport_getImplementationName()
{
return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
}
-uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames()
+uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames()
{
const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.import";
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext )
+uno::Reference< uno::XInterface > QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext ));
}
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 051af9c34104..c4ff54bcf492 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -43,19 +43,19 @@ using namespace ::oox::drawingml;
namespace oox { namespace ppt {
-OUString SAL_CALL QuickDiagrammingLayout_getImplementationName()
+OUString QuickDiagrammingLayout_getImplementationName()
{
return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" );
}
-uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames()
+uno::Sequence< OUString > QuickDiagrammingLayout_getSupportedServiceNames()
{
const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.layout";
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext )
+uno::Reference< uno::XInterface > QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast<cppu::OWeakObject*>(new QuickDiagrammingLayout( rxContext ));
}
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index cd7e37fbf1d4..f8fb72526e06 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -52,12 +52,12 @@ using ::com::sun::star::lang::XComponent;
namespace oox { namespace ppt {
-OUString SAL_CALL PowerPointImport_getImplementationName()
+OUString PowerPointImport_getImplementationName()
{
return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" );
}
-uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames()
+uno::Sequence< OUString > PowerPointImport_getSupportedServiceNames()
{
Sequence< OUString > aSeq( 2 );
aSeq[ 0 ] = "com.sun.star.document.ImportFilter";
@@ -65,7 +65,7 @@ uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames()
return aSeq;
}
-uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext )
+uno::Reference< uno::XInterface > PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast< ::cppu::OWeakObject* >( new PowerPointImport( rxContext ) );
}
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 019874b727be..b5e2f6dfc6e3 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -43,19 +43,19 @@ using namespace ::com::sun::star;
using namespace core;
using namespace drawingml;
-OUString SAL_CALL ShapeContextHandler_getImplementationName()
+OUString ShapeContextHandler_getImplementationName()
{
return OUString( "com.sun.star.comp.oox.ShapeContextHandler" );
}
-uno::Sequence< OUString > SAL_CALL
+uno::Sequence< OUString >
ShapeContextHandler_getSupportedServiceNames()
{
uno::Sequence< OUString > s { "com.sun.star.xml.sax.FastShapeContextHandler" };
return s;
}
-uno::Reference< uno::XInterface > SAL_CALL
+uno::Reference< uno::XInterface >
ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext > & context)
{
return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 21:41:43 +0000