diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-06 08:59:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-07 11:25:55 +0100 |
commit | dd0dceb51122b4e8e969f848d9f046e91962d254 (patch) | |
tree | f927f0870a54ad7cb887e6e7d5bb7956d44d0665 /include | |
parent | caf1eb15838729e05a70d2fcb8de6834394b5764 (diff) |
loplugin:salcall handle static methods
Change-Id: Id6820abec4b8ca8bee26d62b333fd30b42a14aec
Reviewed-on: https://gerrit.libreoffice.org/46007
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/interfacecontainer2.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/FValue.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/sqliterator.hxx | 8 | ||||
-rw-r--r-- | include/connectivity/sqlscan.hxx | 8 | ||||
-rw-r--r-- | include/i18nutil/unicode.hxx | 18 | ||||
-rw-r--r-- | include/oox/ppt/timenodelistcontext.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/filedlghelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmgridif.hxx | 20 | ||||
-rw-r--r-- | include/svx/unomod.hxx | 2 | ||||
-rw-r--r-- | include/svx/unoshape.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 2 |
11 files changed, 41 insertions, 41 deletions
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 ); } |