summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter/xml
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-14 08:45:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-14 13:03:06 +0100
commit6f4f5677acff2711b4cfdae6ba1a0892e62b179a (patch)
treeba97fc99b67b9b139bdf6807ceedcb168fa68fd2 /dbaccess/source/filter/xml
parent581640ac53f8568157ffc3b5c82b2ae7da576e3b (diff)
No need to keep these whitelisted functions decorated with SAL_CALL
The only effect SAL_CALL effectively has on LO-internal code is to change non- static member functions from __thiscall to __cdecl in MSVC (where all other functions are __cdecl by default, anyway). (For 3rd-party code, it could be argued that SAL_CALL is useful on function declarations in the URE stable interface other than non-static member functions, too, in case 3rd-party code uses a compiler switch to change the default calling convention to something other than __cdecl. But loplugin:salcall exempts the URE stable interface, anyway.) One could argue that SAL_CALL, even if today it effectively only affects non- static member functions in MSVC, could be extended in the future to affect more functions on more platforms. However, the current code would already not support that. For example, 3af500580b1c82eabd60335c9ebc458a3f68850c "loplugin:salcall fix functions" changed FrameControl_createInstance in UnoControls/source/base/registercontrols.cxx to no longer be SAL_CALL, even though its address (in ctl_component_getFacrory, in the same file) is passed to cppuhelper::createSingleFactory as an argument of type cppu::ComponentInstantiation, which is a pointer to SAL_CALL function. Change-Id: I3acbf7314a3d7868ed70e35bb5c47bc11a0b7ff6 Reviewed-on: https://gerrit.libreoffice.org/46436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess/source/filter/xml')
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx26
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx6
5 files changed, 24 insertions, 24 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index d7c8f18af9f6..6de682c0ff6a 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -112,7 +112,7 @@ public:
}
static Sequence< OUString> getSupportedServiceNames_Static() throw( );
static css::uno::Reference< css::uno::XInterface >
- SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+ Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
};
@@ -183,7 +183,7 @@ OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::Prope
return OUString();
}
-Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMultiServiceFactory > & rSMgr )
+Reference< XInterface > DBTypeDetection::Create( const Reference< XMultiServiceFactory > & rSMgr )
{
return *(new DBTypeDetection( comphelper::getComponentContext(rSMgr) ));
}
@@ -247,7 +247,7 @@ public:
}
static Sequence< OUString > getSupportedServiceNames_Static() throw( );
static css::uno::Reference< css::uno::XInterface >
- SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+ Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
// XLoader
virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
@@ -267,7 +267,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactor
}
-Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr )
+Reference< XInterface > DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr )
{
return *(new DBContentLoader( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 1dbd082cd983..5c7bfb047e67 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -69,19 +69,19 @@ namespace dbaxml
{
public:
/// @throws RuntimeException
- static OUString SAL_CALL getImplementationName_Static( );
+ static OUString getImplementationName_Static( );
/// @throws RuntimeException
- static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
- static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
+ static Sequence< OUString > getSupportedServiceNames_Static( );
+ static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
};
class ODBFullExportHelper
{
public:
/// @throws RuntimeException
- static OUString SAL_CALL getImplementationName_Static( );
+ static OUString getImplementationName_Static( );
/// @throws RuntimeException
- static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
- static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
+ static Sequence< OUString > getSupportedServiceNames_Static( );
+ static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
};
}
@@ -103,31 +103,31 @@ extern "C" void createRegistryInfo_OFullExport( )
namespace dbaxml
{
- Reference< XInterface > SAL_CALL ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
+ Reference< XInterface > ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY ));
}
- OUString SAL_CALL ODBExportHelper::getImplementationName_Static( )
+ OUString ODBExportHelper::getImplementationName_Static( )
{
return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
}
- Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( )
+ Sequence< OUString > ODBExportHelper::getSupportedServiceNames_Static( )
{
Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
return aSupported;
}
- Reference< XInterface > SAL_CALL ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
+ Reference< XInterface > ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::ALL));
}
- OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( )
+ OUString ODBFullExportHelper::getImplementationName_Static( )
{
return OUString("com.sun.star.comp.sdb.XMLFullExporter");
}
- Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( )
+ Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( )
{
Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
return aSupported;
@@ -260,7 +260,7 @@ css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
}
css::uno::Reference< css::uno::XInterface >
- SAL_CALL ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+ ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBExport( comphelper::getComponentContext(_rxORB), getImplementationName_Static()));
}
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 441974d8736c..1f357c201e14 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -172,13 +172,13 @@ public:
ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL getImplementationName_Static();
+ static OUString getImplementationName_Static();
/// @throws css::uno::RuntimeException
- static css::uno::Sequence<OUString> SAL_CALL
+ static css::uno::Sequence<OUString>
getSupportedServiceNames_Static();
- static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
+ static css::uno::Reference<css::uno::XInterface> Create(
css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index f3980dcdb810..8684012c47ac 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -239,7 +239,7 @@ css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
css::uno::Reference< css::uno::XInterface >
- SAL_CALL ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
+ ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
{
return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB)));
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 9c8188ebb21b..896dbecc7bb0 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -112,13 +112,13 @@ public:
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL getImplementationName_Static();
+ static OUString getImplementationName_Static();
/// @throws css::uno::RuntimeException
- static css::uno::Sequence<OUString> SAL_CALL
+ static css::uno::Sequence<OUString>
getSupportedServiceNames_Static();
- static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
+ static css::uno::Reference<css::uno::XInterface> Create(
css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
// helper class