[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source cppu/qa dtrans/source filter/source forms/source framework/inc i18npool/inc i18npool/source i18nutil/source include/comphelper include/connectivity include/i18nutil include/oox include/sfx2 include/svx include/toolkit lingucomponent/source linguistic/source pyuno/inc salhelper/source sfx2/source svl/source svx/source sw/inc sw/source toolkit/source ucb/source unotools/source xmlhelp/source xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Dec 7 10:27:43 UTC 2017
compilerplugins/clang/salcall.cxx | 23 ++++++++++++-
connectivity/source/inc/OColumn.hxx | 8 ++--
connectivity/source/inc/OTypeInfo.hxx | 8 ++--
connectivity/source/inc/TKeyValue.hxx | 8 ++--
connectivity/source/inc/TSkipDeletedSet.hxx | 8 ++--
connectivity/source/inc/TSortIndex.hxx | 8 ++--
connectivity/source/inc/file/fanalyzer.hxx | 8 ++--
connectivity/source/inc/file/fcode.hxx | 8 ++--
connectivity/source/inc/file/fcomp.hxx | 8 ++--
cppu/qa/test_reference.cxx | 2 -
dtrans/source/cnttype/mcnttype.cxx | 2 -
dtrans/source/cnttype/mcnttype.hxx | 2 -
filter/source/xsltfilter/LibXSLTTransformer.hxx | 2 -
forms/source/component/EventThread.hxx | 4 +-
forms/source/xforms/binding.cxx | 2 -
forms/source/xforms/binding.hxx | 2 -
framework/inc/dispatch/popupmenudispatcher.hxx | 2 -
i18npool/inc/breakiteratorImpl.hxx | 2 -
i18npool/inc/cclass_unicode.hxx | 2 -
i18npool/inc/inputsequencechecker.hxx | 2 -
i18npool/inc/transliteration_Ignore.hxx | 2 -
i18npool/source/characterclassification/cclass_unicode.cxx | 2 -
i18npool/source/inputchecker/inputsequencechecker.cxx | 2 -
i18npool/source/transliteration/transliteration_Ignore.cxx | 2 -
i18nutil/source/utility/unicode.cxx | 18 +++++-----
include/comphelper/interfacecontainer2.hxx | 8 ++--
include/connectivity/FValue.hxx | 8 ++--
include/connectivity/sqliterator.hxx | 8 ++--
include/connectivity/sqlscan.hxx | 8 ++--
include/i18nutil/unicode.hxx | 18 +++++-----
include/oox/ppt/timenodelistcontext.hxx | 2 -
include/sfx2/filedlghelper.hxx | 2 -
include/svx/fmgridif.hxx | 20 +++++------
include/svx/unomod.hxx | 2 -
include/svx/unoshape.hxx | 4 +-
include/toolkit/awt/vclxwindows.hxx | 2 -
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 6 +--
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 6 +--
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 6 +--
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 6 +--
linguistic/source/spelldsp.cxx | 2 -
linguistic/source/spelldsp.hxx | 2 -
pyuno/inc/pyuno.hxx | 4 +-
salhelper/source/timer.cxx | 2 -
sfx2/source/dialog/filedlghelper.cxx | 2 -
sfx2/source/doc/doctemplateslocal.cxx | 4 +-
sfx2/source/doc/doctemplateslocal.hxx | 4 +-
svl/source/passwordcontainer/passwordcontainer.cxx | 2 -
svl/source/passwordcontainer/passwordcontainer.hxx | 2 -
svx/source/unodraw/unomod.cxx | 2 -
svx/source/unodraw/unoshape.cxx | 4 +-
sw/inc/unoframe.hxx | 12 +++---
sw/inc/unotxdoc.hxx | 4 +-
sw/source/core/unocore/unoframe.cxx | 12 +++---
sw/source/uibase/uno/unotxdoc.cxx | 4 +-
toolkit/source/awt/vclxwindows.cxx | 2 -
ucb/source/cacher/cachedcontentresultset.cxx | 4 +-
ucb/source/cacher/cachedcontentresultsetstub.cxx | 6 +--
ucb/source/cacher/cachedcontentresultsetstub.hxx | 6 +--
ucb/source/ucp/file/filtask.cxx | 20 +++++------
ucb/source/ucp/file/filtask.hxx | 20 +++++------
ucb/source/ucp/file/prov.cxx | 2 -
ucb/source/ucp/file/prov.hxx | 2 -
unotools/source/config/eventcfg.cxx | 4 +-
xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 2 -
xmlhelp/source/treeview/tvfactory.cxx | 2 -
xmlsecurity/source/component/certificatecontainer.hxx | 2 -
67 files changed, 199 insertions(+), 178 deletions(-)
New commits:
commit dd0dceb51122b4e8e969f848d9f046e91962d254
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Dec 6 08:59:44 2017 +0200
loplugin:salcall handle static methods
Change-Id: Id6820abec4b8ca8bee26d62b333fd30b42a14aec
Reviewed-on: https://gerrit.libreoffice.org/46007
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index b36bc5cc1db0..36a8635d4f7f 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -42,6 +42,9 @@ public:
// ignore this one. I can't get accurate source code from getCharacterData() for it.
if (fn == SRCDIR "/sal/rtl/string.cxx")
return;
+ // clang returns completely bogus source range for something in this file
+ if (fn == SRCDIR "/sd/source/ui/unoidl/unomodel.cxx")
+ return;
m_phase = PluginPhase::FindAddressOf;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
m_phase = PluginPhase::Warning;
@@ -206,7 +209,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
// @TODO For now, I am ignore free functions, since those are most likely to have their address taken.
// I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers
// that the calling convention of the function matches the calling convention of the function pointer!
- if (!methodDecl || methodDecl->isStatic())
+ if (!methodDecl)
return true;
// can only check when we have a definition since this is the most likely time
@@ -268,6 +271,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
return true;
}
+ // if any of the overridden methods are SAL_CALL, we should be too
if (methodDecl)
{
for (auto iter = methodDecl->begin_overridden_methods();
@@ -279,6 +283,23 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
}
}
+ // these often have their address taken
+ if (methodDecl && methodDecl->getIdentifier())
+ {
+ auto name = methodDecl->getName();
+ if (name == "getImplementationName_static" || name == "getSupportedServiceNames_static"
+ || name == "getSupportedServiceNames_Static" || name == "Create" || name == "create"
+ || name == "CreateInstance" || name == "getImplementationName_Static"
+ || name == "getSingletonName_static" || name == "getLdapUserProfileBeName"
+ || name == "getLdapUserProfileBeServiceNames" || name == "impl_staticCreateSelfInstance"
+ || name == "impl_createInstance" || name == "impl_staticGetImplementationName"
+ || name == "impl_staticGetSupportedServiceNames"
+ || name == "impl_getStaticSupportedServiceNames"
+ || name == "impl_getStaticImplementationName" || name == "getBackendName"
+ || name == "getBackendServiceNames")
+ return true;
+ }
+
bool bOK = rewrite(rewriteLoc);
if (bOK && canonicalDecl != decl)
{
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index e0d86d7e9497..cd1bd903ad1a 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -101,13 +101,13 @@ namespace connectivity
m_ColumnLabel = _aColumnName;
}
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t ,void* _pHint )
+ static void * operator new( size_t ,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
bool isAutoIncrement() const { return m_AutoIncrement; }
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 69cb31bbc90d..002a5a7c067c 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -43,13 +43,13 @@ namespace connectivity
,nType( css::sdbc::DataType::OTHER)
{}
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
+ static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
+ static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index bd77b0caa7d4..4cd5613b7bd2 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -34,13 +34,13 @@ namespace connectivity
~OKeyValue();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
static OKeyValue* createKeyValue(sal_Int32 nVal);
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 2a24588b6592..6e177c877f54 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -41,13 +41,13 @@ namespace connectivity
OSkipDeletedSet(IResultSetHelper* _pHelper);
~OSkipDeletedSet();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
/**
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 075d37108602..5429f3a1087d 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -63,13 +63,13 @@ namespace connectivity
~OSortIndex();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 63702ed09e85..ea33b682a8e7 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -45,13 +45,13 @@ namespace connectivity
public:
OSQLAnalyzer(OConnection* _pConnection);
~OSQLAnalyzer();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
+ static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
+ static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
OConnection* getConnection() const { return m_pConnection; }
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 6993a799a180..d83ede26aed0 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -53,13 +53,13 @@ namespace connectivity
OCode& operator=(const OCode&) = default;
OCode& operator=(OCode&&) = default;
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
+ static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
+ static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
};
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 3706c1c07171..1485060873a1 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -48,13 +48,13 @@ namespace connectivity
virtual ~OPredicateCompiler() override;
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
+ static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
+ static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
void dispose();
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index b0902525f209..d29fc8da87eb 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -89,7 +89,7 @@ private:
struct Base1: public css::uno::XInterface {
virtual ~Base1() = delete;
- static ::css::uno::Type const & SAL_CALL static_type(void * = nullptr) // loplugin:refcounting
+ static ::css::uno::Type const & static_type(void * = nullptr) // loplugin:refcounting
{ return ::cppu::UnoType<Base1>::get(); }
};
struct Base2: public Base1 {
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 2a405b5a0e74..3f982dd8a62c 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -333,7 +333,7 @@ void CMimeContentType::comment()
}
}
-bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
+bool CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
{
return ( aRange.indexOf( aChr ) > -1 );
}
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 61e9594b2ba8..35fb37fbdba1 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -60,7 +60,7 @@ private:
OUString quotedPValue( );
OUString nonquotedPValue( );
void comment();
- static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange );
+ static bool isInRange( const OUString& aChr, const OUString& aRange );
private:
::osl::Mutex m_aMutex;
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 7ef53fea7137..da5760a7890f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -77,7 +77,7 @@ namespace XSLT
xsltTransformContextPtr m_tcontext;
virtual void execute() override;
- static void SAL_CALL registerExtensionModule();
+ static void registerExtensionModule();
};
/*
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 0050467d9818..ec5e8d706faa 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -97,8 +97,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override;
// Resolve ambiguity: both OWeakObject and OObject have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
+ void * operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
+ void operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
private:
void impl_clearEventQueue();
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 2b9cc9f97390..16276212a27e 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -311,7 +311,7 @@ css::uno::Sequence<sal_Int8> Binding::getUnoTunnelID()
return aImplementationId.getImplementationId();
}
-Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertySet )
+Binding* Binding::getBinding( const Reference<XPropertySet>& xPropertySet )
{
Reference<XUnoTunnel> xTunnel( xPropertySet, UNO_QUERY );
return xTunnel.is()
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 1bd019a7d497..dc6ba779bbc4 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -258,7 +258,7 @@ public:
// the ID for XUnoTunnel calls
static css::uno::Sequence<sal_Int8> getUnoTunnelID();
- static Binding* SAL_CALL getBinding( const css::uno::Reference<css::beans::XPropertySet>& );
+ static Binding* getBinding( const css::uno::Reference<css::beans::XPropertySet>& );
private:
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index f5a561660df8..b93d806f93d3 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -80,7 +80,7 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper<
/* Helper for registry */
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
- static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
+ static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 0b71496e44eb..6ecaef630d3e 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -105,7 +105,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
- static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
+ static sal_Int16 getScriptClass(sal_uInt32 currentChar);
protected:
css::i18n::Boundary result; // for word break iterator
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index b3390de4b6f1..e48e048c5176 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -176,7 +176,7 @@ private:
bool setupInternational( const css::lang::Locale& rLocale );
/// Implementation of getCharacterType() for one single character
- static sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
+ static sal_Int32 getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
};
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index e31ea6240d64..0c27637b9535 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -70,7 +70,7 @@ private:
/// @throws css::uno::RuntimeException
css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage);
- static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
+ static sal_Char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
};
}
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index be0c2b357262..6e01a3e8a1e9 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -53,7 +53,7 @@ public:
transliterateChar2Char( sal_Unicode inChar) override;
/// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > SAL_CALL
+ static css::uno::Sequence< OUString >
transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 );
struct Mapping {
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index a111dd3936ba..12e7d6b1e398 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -145,7 +145,7 @@ cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) {
}
-sal_Int32 SAL_CALL
+sal_Int32
cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 increment) {
using namespace ::com::sun::star::i18n::KCharacterType;
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 155423b5ec1f..fc92cea926c0 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -88,7 +88,7 @@ static ScriptTypeList typeList[] = {
{ UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, (sal_Int16)UnicodeScript_kScriptCount } // 88
};
-sal_Char* SAL_CALL
+sal_Char*
InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar)
{
css::i18n::UnicodeScript type = (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( cChar, typeList, (sal_Int16)UnicodeScript_kScriptCount );
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index 4c0a4323acbf..503bf7d1858e 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -88,7 +88,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
return folding( inStr, startPos, nCount, offset);
}
-Sequence< OUString > SAL_CALL
+Sequence< OUString >
transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2,
XTransliteration& t1, XTransliteration& t2 )
{
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 0173a4ad5fbf..1ece83ed8f64 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -50,22 +50,22 @@ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {
typeList[i].value : unknownType;
}
-sal_Int16 SAL_CALL
+sal_Int16
unicode::getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList* typeList, sal_Int16 unknownType ) {
return getScriptType(ch, typeList, unknownType);
}
-sal_Unicode SAL_CALL
+sal_Unicode
unicode::getUnicodeScriptStart( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeFrom];
}
-sal_Unicode SAL_CALL
+sal_Unicode
unicode::getUnicodeScriptEnd( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeTo];
}
-sal_Int16 SAL_CALL
+sal_Int16
unicode::getUnicodeType( const sal_Unicode ch ) {
static sal_Unicode c = 0x00;
static sal_Int16 r = 0x00;
@@ -78,7 +78,7 @@ unicode::getUnicodeType( const sal_Unicode ch ) {
UnicodeTypeValue[((address - UnicodeTypeNumberBlock) << 8) + (ch & 0xff)]);
}
-sal_uInt8 SAL_CALL
+sal_uInt8
unicode::getUnicodeDirection( const sal_Unicode ch ) {
static sal_Unicode c = 0x00;
static sal_uInt8 r = 0x00;
@@ -125,11 +125,11 @@ IsType(unicode::isSpace, SPACEMASK)
#define CONTROLSPACE bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f)
-bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
+bool unicode::isWhiteSpace( const sal_Unicode ch) {
return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE)));
}
-sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
+sal_Int16 unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
{
//See unicode/uscript.h
static const sal_Int16 scriptTypes[] =
@@ -186,7 +186,7 @@ sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
return nRet;
}
-OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
+OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
{
OString sRet;
switch (eScript)
@@ -733,7 +733,7 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
//Format a number as a percentage according to the rules of the given
//language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
-OUString SAL_CALL unicode::formatPercent(double dNumber,
+OUString unicode::formatPercent(double dNumber,
const LanguageTag &rLangTag)
{
// get a currency formatter for this locale ID
diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index d65cb78c0a25..269da31a6666 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2
{
public:
// these are here to force memory de/allocation to sal lib.
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * operator new( size_t, void * pMem )
{ return pMem; }
- static void SAL_CALL operator delete( void *, void * )
+ static void operator delete( void *, void * )
{}
/**
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 33279f12757e..241f14ce0b0a 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -278,13 +278,13 @@ namespace connectivity
free();
}
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
ORowSetValue& operator=(const ORowSetValue& _rRH);
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index e9a0fc119768..68810e20b046 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -158,13 +158,13 @@ namespace connectivity
const OSQLParser& _rParser );
~OSQLParseTreeIterator();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
void dispose();
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 3d9304882539..12addf24a2be 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -44,13 +44,13 @@ namespace connectivity
OSQLScanner();
virtual ~OSQLScanner();
- static void * SAL_CALL operator new( size_t nSize )
+ static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * operator new( size_t,void* _pHint )
{ return _pHint; }
- static void SAL_CALL operator delete( void * pMem )
+ static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- static void SAL_CALL operator delete( void *,void* )
+ static void operator delete( void *,void* )
{ }
sal_Int32 SQLyygetc();
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index 3380c69ad4c7..6175e19fffd9 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -37,25 +37,25 @@ class I18NUTIL_DLLPUBLIC unicode
{
public:
- static sal_Int16 SAL_CALL getUnicodeType( const sal_Unicode ch );
- static sal_Int16 SAL_CALL getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 );
- static sal_Unicode SAL_CALL getUnicodeScriptStart(css::i18n::UnicodeScript type);
- static sal_Unicode SAL_CALL getUnicodeScriptEnd(css::i18n::UnicodeScript type);
- static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
+ static sal_Int16 getUnicodeType( const sal_Unicode ch );
+ static sal_Int16 getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 );
+ static sal_Unicode getUnicodeScriptStart(css::i18n::UnicodeScript type);
+ static sal_Unicode getUnicodeScriptEnd(css::i18n::UnicodeScript type);
+ static sal_uInt8 getUnicodeDirection( const sal_Unicode ch );
static bool SAL_CALL isControl( const sal_Unicode ch);
static bool SAL_CALL isAlpha( const sal_Unicode ch);
static bool SAL_CALL isSpace( const sal_Unicode ch);
- static bool SAL_CALL isWhiteSpace( const sal_Unicode ch);
+ static bool isWhiteSpace( const sal_Unicode ch);
//Map an ISO 15924 script code to Latin/Asian/Complex/Weak
- static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript);
+ static sal_Int16 getScriptClassFromUScriptCode(UScriptCode eScript);
//Return a language that can be written in a given ISO 15924 script code
- static OString SAL_CALL getExemplarLanguageForUScriptCode(UScriptCode eScript);
+ static OString getExemplarLanguageForUScriptCode(UScriptCode eScript);
//Format a number as a percentage according to the rules of the given
//language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
- static OUString SAL_CALL formatPercent(double dNumber,
+ static OUString formatPercent(double dNumber,
const LanguageTag &rLangTag);
};
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index c93ee8a4880f..02cba2936fe7 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -40,7 +40,7 @@ namespace oox { namespace ppt {
public:
virtual ~TimeNodeContext() throw() override;
- static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+ static TimeNodeContext * makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected:
TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw();
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 083e5a402ce2..9e589693ad00 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -206,7 +206,7 @@ public:
void DirectoryChanged();
virtual void ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void DialogSizeChanged();
- static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
+ static OUString HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods
void DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 0982c0dd38f1..df3c33845b1e 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -83,8 +83,8 @@ public:
virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -108,8 +108,8 @@ public:
virtual void SAL_CALL updated(const css::lang::EventObject &) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -132,8 +132,8 @@ public:
virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -156,8 +156,8 @@ public:
virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
@@ -181,8 +181,8 @@ public:
virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
- void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
+ void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
+ void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index e139035396c3..805f6c040b7e 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -41,7 +41,7 @@ public:
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier );
+ static css::uno::Reference< css::uno::XInterface > createTextField( const OUString& aServiceSpecifier );
// internal
static css::uno::Sequence< OUString >
concatServiceNames( css::uno::Sequence< OUString >& rServices1,
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index e9475788c84a..ba28d311dd5d 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -216,8 +216,8 @@ public:
sal_uInt32 getShapeKind() const;
// styles need this
- static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
- static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
+ static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
+ static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
/** same as SetFillAttribute but for property names instead of which ids,
and the property found is returned instead of set at the object
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index b6b9250a8b84..58a32090c120 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -670,7 +670,7 @@ public:
// css::awt::XLayoutConstrains
css::awt::Size SAL_CALL getMinimumSize() override;
/// @throws css::uno::RuntimeException
- static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window const * p );
+ static css::awt::Size implGetMinimumSize( vcl::Window const * p );
static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 1a9c1d628a14..06798c5ebd2c 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -683,21 +683,21 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
return nullptr;
}
-OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
+OUString Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->lowercase(aTerm);
return aTerm;
}
-OUString SAL_CALL Hyphenator::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
+OUString Hyphenator::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->uppercase(aTerm);
return aTerm;
}
-OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass const * pCC)
+OUString Hyphenator::makeInitCap(const OUString& aTerm, CharClass const * pCC)
{
sal_Int32 tlen = aTerm.getLength();
if (pCC && tlen)
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index 94b1f294c787..abaafef3ec6d 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -119,9 +119,9 @@ public:
static Sequence< OUString > getSupportedServiceNames_Static() throw();
private:
- static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *);
- static OUString SAL_CALL makeUpperCase(const OUString&, CharClass const *);
- static OUString SAL_CALL makeInitCap(const OUString&, CharClass const *);
+ static OUString makeLowerCase(const OUString&, CharClass const *);
+ static OUString makeUpperCase(const OUString&, CharClass const *);
+ static OUString makeInitCap(const OUString&, CharClass const *);
};
inline OUString Hyphenator::getImplementationName_Static() throw()
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 6f6d3880e9c7..fd0e5cda95f4 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -549,21 +549,21 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
}
}
-OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
+OUString Thesaurus::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->lowercase(aTerm);
return aTerm;
}
-OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
+OUString Thesaurus::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->uppercase(aTerm);
return aTerm;
}
-OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass const * pCC)
+OUString Thesaurus::makeInitCap(const OUString& aTerm, CharClass const * pCC)
{
sal_Int32 tlen = aTerm.getLength();
if (pCC && tlen)
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 90220393c979..f1c27822b859 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -120,9 +120,9 @@ public:
getSupportedServiceNames_Static() throw();
private:
- static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *);
- static OUString SAL_CALL makeUpperCase(const OUString&, CharClass const *);
- static OUString SAL_CALL makeInitCap(const OUString&, CharClass const *);
+ static OUString makeLowerCase(const OUString&, CharClass const *);
+ static OUString makeUpperCase(const OUString&, CharClass const *);
+ static OUString makeInitCap(const OUString&, CharClass const *);
};
inline OUString Thesaurus::getImplementationName_Static() throw()
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index ff0db02ab495..3fc518a208a2 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -847,7 +847,7 @@ void SpellCheckerDispatcher::setCharClass(const LanguageTag& rLanguageTag)
}
-OUString SAL_CALL SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
+OUString SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->lowercase(aTerm);
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 719bdf0b6d7f..9d165dd87347 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -113,7 +113,7 @@ public:
private:
void setCharClass(const LanguageTag& rLanguageTag);
- static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *);
+ static OUString makeLowerCase(const OUString&, CharClass const *);
};
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index f09cbd051089..85c8ef9cdaff 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -210,14 +210,14 @@ public:
@throw RuntimeException in case the thread is not attached or the runtime
has not been initialized.
*/
- static void SAL_CALL initialize(
+ static void initialize(
const css::uno::Reference< css::uno::XComponentContext > & ctx );
/** Checks, whether the uno runtime is already initialized in the current python interpreter.
@throws css::uno::RuntimeException
*/
- static bool SAL_CALL isInitialized();
+ static bool isInitialized();
/** converts something contained in an UNO Any to a Python object
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx
index 3d60f34fbc4c..b4e2dba961ee 100644
--- a/salhelper/source/timer.cxx
+++ b/salhelper/source/timer.cxx
@@ -43,7 +43,7 @@ public:
bool lookupTimer(const salhelper::Timer* pTimer);
/// retrieves the "Singleton" TimerManager Instance
- static TimerManager* SAL_CALL getTimerManager();
+ static TimerManager* getTimerManager();
protected:
/// worker-function of thread
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 2177819b9329..4482d2887c41 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2582,7 +2582,7 @@ void FileDialogHelper::DirectoryChanged()
mpImpl->handleDirectoryChanged();
}
-OUString SAL_CALL FileDialogHelper::HelpRequested( const FilePickerEvent& aEvent )
+OUString FileDialogHelper::HelpRequested( const FilePickerEvent& aEvent )
{
return sfx2::FileDialogHelper_Impl::handleHelpRequested( aEvent );
}
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index cccfb2fa9fc7..294274e2e472 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -50,7 +50,7 @@ std::vector< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequ
}
-void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const std::vector< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext >& xContext )
+void DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const std::vector< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext >& xContext )
{
if ( !xOutStream.is() )
throw uno::RuntimeException();
@@ -92,7 +92,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R
}
-std::vector< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext >& xContext )
+std::vector< beans::StringPair > DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext >& xContext )
{
if ( !xContext.is() || !xInStream.is() )
throw uno::RuntimeException();
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 7e35e8625466..7686d081f001 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -37,7 +37,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocum
std::vector< css::beans::StringPair > const & GetParsingResult();
/// @throws css::uno::Exception
- static std::vector< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ static std::vector< css::beans::StringPair > ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext );
public:
virtual ~DocTemplLocaleHelper() override;
@@ -53,7 +53,7 @@ public:
// writes sequence of elements ( GroupName, GroupUIName )
/// @throws css::uno::Exception
static
- void SAL_CALL WriteGroupLocalizationSequence(
+ void WriteGroupLocalizationSequence(
const css::uno::Reference< css::io::XOutputStream >& xOutStream,
const std::vector< css::beans::StringPair >& aSequence,
const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index c2e8b7100028..49d7b14534d6 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1339,7 +1339,7 @@ Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const R
return Reference< XInterface >( *new PasswordContainer( xServiceManager ) );
}
-Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
+Reference< XSingleServiceFactory > PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
{
Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
PasswordContainer::impl_getStaticImplementationName(),
diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx
index 67ad63e72722..6ce7bb9bcba3 100644
--- a/svl/source/passwordcontainer/passwordcontainer.hxx
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
@@ -315,7 +315,7 @@ public:
static css::uno::Sequence< OUString > SAL_CALL
impl_getStaticSupportedServiceNames( );
/// @throws css::uno::RuntimeException
- static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager );
/// @throws css::uno::RuntimeException
static css::uno::Reference< css::uno::XInterface > SAL_CALL
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 70303e95edc4..ff781cfb6b1a 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -201,7 +201,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
return create(rServiceSpecifier, "");
}
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier )
+uno::Reference< uno::XInterface > SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier )
{
return SvxUnoTextCreateTextField( ServiceSpecifier );
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c2aa90ca7cce..778b4f2911f6 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1418,7 +1418,7 @@ bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
}
-bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel )
+bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel )
{
// check if an item with the given name and which id is inside the models
// pool or the stylesheet pool, if found it's put in the itemset
@@ -1530,7 +1530,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
}
-bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet )
+bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet )
{
OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName);
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 0fcff03dae77..ac0158c54c5f 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -237,8 +237,8 @@ public:
//XPropertySet
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
- void * SAL_CALL operator new( size_t ) throw();
- void SAL_CALL operator delete( void * ) throw();
+ void * operator new( size_t ) throw();
+ void operator delete( void * ) throw();
};
typedef cppu::ImplInheritanceHelper
@@ -268,8 +268,8 @@ public:
// XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override;
- void * SAL_CALL operator new( size_t ) throw();
- void SAL_CALL operator delete( void * ) throw();
+ void * operator new( size_t ) throw();
+ void operator delete( void * ) throw();
};
class SwOLENode;
@@ -309,8 +309,8 @@ public:
// XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override;
- void * SAL_CALL operator new( size_t ) throw();
- void SAL_CALL operator delete( void * ) throw();
+ void * operator new( size_t ) throw();
+ void operator delete( void * ) throw();
};
class SwXOLEListener : public cppu::WeakImplHelper<css::util::XModifyListener>,
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 3f202c88ae54..4e2161af805b 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -447,8 +447,8 @@ public:
SwDocShell* GetDocShell() {return pDocShell;}
- void * SAL_CALL operator new( size_t ) throw();
- void SAL_CALL operator delete( void * ) throw();
+ void * operator new( size_t ) throw();
+ void operator delete( void * ) throw();
};
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 76ea5752dc97..7ff0c80d95c0 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3351,12 +3351,12 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames()
return aRet;
}
-void * SAL_CALL SwXTextFrame::operator new( size_t t) throw()
+void * SwXTextFrame::operator new( size_t t) throw()
{
return SwXTextFrameBaseClass::operator new( t);
}
-void SAL_CALL SwXTextFrame::operator delete( void * p) throw()
+void SwXTextFrame::operator delete( void * p) throw()
{
SwXTextFrameBaseClass::operator delete(p);
}
@@ -3432,12 +3432,12 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames()
return aRet;
}
-void * SAL_CALL SwXTextGraphicObject::operator new( size_t t) throw()
+void * SwXTextGraphicObject::operator new( size_t t) throw()
{
return SwXTextGraphicObjectBaseClass::operator new(t);
}
-void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw()
+void SwXTextGraphicObject::operator delete( void * p) throw()
{
SwXTextGraphicObjectBaseClass::operator delete(p);
}
@@ -3581,12 +3581,12 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames()
return aRet;
}
-void * SAL_CALL SwXTextEmbeddedObject::operator new( size_t t) throw()
+void * SwXTextEmbeddedObject::operator new( size_t t) throw()
{
return SwXTextEmbeddedObjectBaseClass::operator new(t);
}
-void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw()
+void SwXTextEmbeddedObject::operator delete( void * p) throw()
{
SwXTextEmbeddedObjectBaseClass::operator delete(p);
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 7a734e61112a..1143d21d914b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3638,12 +3638,12 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I
#endif
}
-void * SAL_CALL SwXTextDocument::operator new( size_t t) throw()
+void * SwXTextDocument::operator new( size_t t) throw()
{
return SwXTextDocumentBaseClass::operator new(t);
}
-void SAL_CALL SwXTextDocument::operator delete( void * p) throw()
+void SwXTextDocument::operator delete( void * p) throw()
{
SwXTextDocumentBaseClass::operator delete(p);
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index b912d29f2e26..41ca3c429955 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -3706,7 +3706,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
}
}
-css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window const * p )
+css::awt::Size VCLXScrollBar::implGetMinimumSize( vcl::Window const * p )
{
long n = p->GetSettings().GetStyleSettings().GetScrollBarSize();
return css::awt::Size( n, n );
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 9bca9c11b76f..1497ed15071d 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -381,7 +381,7 @@ private:
sal_Int32
impl_getPos( const OUString& rName ) const;
- static bool SAL_CALL
+ static bool
impl_isMyPropertyName( const OUString& rName );
public:
@@ -585,7 +585,7 @@ bool CCRS_PropertySetInfo
}
//static
-bool SAL_CALL CCRS_PropertySetInfo
+bool CCRS_PropertySetInfo
::impl_isMyPropertyName( const OUString& rPropertyName )
{
return ( rPropertyName == g_sPropertyNameForCount
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 93dfbbadc65c..cc0f41fbe598 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -432,21 +432,21 @@ void CachedContentResultSetStub
// XFetchProviderForContentAccess methods.
-void SAL_CALL CachedContentResultSetStub
+void CachedContentResultSetStub
::impl_getCurrentContentIdentifierString( Any& rAny
, const Reference< XContentAccess >& xContentAccess )
{
rAny <<= xContentAccess->queryContentIdentifierString();
}
-void SAL_CALL CachedContentResultSetStub
+void CachedContentResultSetStub
::impl_getCurrentContentIdentifier( Any& rAny
, const Reference< XContentAccess >& xContentAccess )
{
rAny <<= xContentAccess->queryContentIdentifier();
}
-void SAL_CALL CachedContentResultSetStub
+void CachedContentResultSetStub
::impl_getCurrentContent( Any& rAny
, const Reference< XContentAccess >& xContentAccess )
{
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 485952e8b573..65f120086604 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -61,19 +61,19 @@ private:
impl_getColumnCount();
/// @throws css::uno::RuntimeException
- static void SAL_CALL
+ static void
impl_getCurrentContentIdentifierString(
css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
/// @throws css::uno::RuntimeException
- static void SAL_CALL
+ static void
impl_getCurrentContentIdentifier(
css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
/// @throws css::uno::RuntimeException
- static void SAL_CALL
+ static void
impl_getCurrentContent(
css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 738628a8e495..5f0186c8ee75 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2007,7 +2007,7 @@ void TaskManager::insertDefaultProperties( const OUString& aUnqPath )
/******************************************************************************/
-bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq )
+bool TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq )
{
if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" )
{
@@ -2028,7 +2028,7 @@ bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq )
}
-bool SAL_CALL TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url )
+bool TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url )
{
bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url );
@@ -2650,7 +2650,7 @@ TaskManager::getContentDeletedEventListeners( const OUString& aName )
}
-void SAL_CALL
+void
TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName )
{
std::vector< ContentEventNotifier* >::iterator it = listeners->begin();
@@ -2664,7 +2664,7 @@ TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const
}
-void SAL_CALL
+void
TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listeners )
{
std::vector< ContentEventNotifier* >::iterator it = listeners->begin();
@@ -2678,7 +2678,7 @@ TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listene
}
-void SAL_CALL
+void
TaskManager::notifyContentRemoved( std::vector< ContentEventNotifier* >* listeners,
const OUString& aChildName )
{
@@ -2716,7 +2716,7 @@ TaskManager::getPropertySetListeners( const OUString& aName )
}
-void SAL_CALL
+void
TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName )
{
@@ -2731,7 +2731,7 @@ TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >*
}
-void SAL_CALL
+void
TaskManager::notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName )
{
@@ -2844,7 +2844,7 @@ TaskManager::getContentExchangedEventListeners( const OUString& aOldPrefix,
}
-void SAL_CALL
+void
TaskManager::notifyContentExchanged( std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec )
{
for( std::vector< ContentEventNotifier* >* listeners : *listeners_vec)
@@ -2885,7 +2885,7 @@ TaskManager::getPropertyChangeNotifier( const OUString& aName )
}
-void SAL_CALL TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners,
+void TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners,
const uno::Sequence< beans::PropertyChangeEvent >& seqChanged )
{
std::vector< PropertyChangeNotifier* >::iterator it = listeners->begin();
@@ -3061,7 +3061,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo()
/* */
/*******************************************************************************/
-void SAL_CALL
+void
TaskManager::getScheme( OUString& Scheme )
{
Scheme = "file";
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 73d85afaeca1..e89ca36e2a72 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -499,9 +499,9 @@ namespace fileaccess
/* */
/******************************************************************************/
- static bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq );
+ static bool getUnqFromUrl( const OUString& Url, OUString& Unq );
- static bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url );
+ static bool getUrlFromUnq( const OUString& Unq, OUString& Url );
bool m_bWithConfig;
@@ -537,28 +537,28 @@ namespace fileaccess
/* notify eventListeners */
/********************************************************************************/
- static void SAL_CALL notifyPropertyChanges(
+ static void notifyPropertyChanges(
std::vector< PropertyChangeNotifier* >* listeners,
const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged );
- static void SAL_CALL notifyContentExchanged(
+ static void notifyContentExchanged(
std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec );
- static void SAL_CALL notifyInsert(
+ static void notifyInsert(
std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName );
- static void SAL_CALL notifyContentDeleted(
+ static void notifyContentDeleted(
std::vector< ContentEventNotifier* >* listeners );
- static void SAL_CALL notifyContentRemoved(
+ static void notifyContentRemoved(
std::vector< ContentEventNotifier* >* listeners,
const OUString& aChildName );
- static void SAL_CALL notifyPropertyAdded(
+ static void notifyPropertyAdded(
std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName );
- static void SAL_CALL notifyPropertyRemoved(
+ static void notifyPropertyRemoved(
std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName );
@@ -680,7 +680,7 @@ namespace fileaccess
// Miscellaneous:
// Methods for "writeComponentInfo" and "createComponentFactory"
- static void SAL_CALL getScheme( OUString& Scheme );
+ static void getScheme( OUString& Scheme );
static OUString SAL_CALL getImplementationName_static();
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 281ab149e67a..2cfcc149e336 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -136,7 +136,7 @@ FileProvider::getSupportedServiceNames()
return fileaccess::TaskManager::getSupportedServiceNames_static();
}
-Reference< XSingleServiceFactory > SAL_CALL
+Reference< XSingleServiceFactory >
FileProvider::createServiceFactory(
const Reference< XMultiServiceFactory >& rxServiceMgr )
{
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 9b336a108bce..30979e275c3c 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -73,7 +73,7 @@ namespace fileaccess {
getSupportedServiceNames() override;
- static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
createServiceFactory(
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 6f26ea335dcf..98cfd1a76dae 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -111,7 +111,7 @@ public:
/// @throws css::uno::RuntimeException
bool hasByName( const OUString& aName );
/// @throws css::uno::RuntimeException
- static css::uno::Type SAL_CALL getElementType( );
+ static css::uno::Type getElementType( );
/// @throws css::uno::RuntimeException
bool hasElements() const;
OUString const & GetEventName( GlobalEventId nID ) const;
@@ -300,7 +300,7 @@ bool GlobalEventConfig_Impl::hasByName( const OUString& aName )
return pos != m_supportedEvents.end();
}
-Type SAL_CALL GlobalEventConfig_Impl::getElementType( )
+Type GlobalEventConfig_Impl::getElementType( )
{
//DF definitely not sure about this??
return cppu::UnoType<Sequence<beans::PropertyValue>>::get();
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 1563c8896941..86dc3a8cf6b6 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -73,7 +73,7 @@ class TVFactory: public cppu::WeakImplHelper <
static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
- static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
createServiceFactory(
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 65b934273e48..6bb587703cfd 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -138,7 +138,7 @@ TVFactory::getSupportedServiceNames_static()
return seq;
}
-Reference< XSingleServiceFactory > SAL_CALL
+Reference< XSingleServiceFactory >
TVFactory::createServiceFactory(
const Reference< XMultiServiceFactory >& rxServiceMgr )
{
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index e7e8658de548..6bd64f524930 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -39,7 +39,7 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI
Map certMap;
Map certTrustMap;
- static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
+ static bool searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
/// @throws css::uno::RuntimeException
bool isTemporaryCertificate( const OUString & url, const OUString & certificate_name );
/// @throws css::uno::RuntimeException
More information about the Libreoffice-commits
mailing list