Make loplugin:salcall look into macros too

"Indirect" calls to isSallCallFunction (for canonic and overridden
FunctionDecls) already needed to handle many cases of FunctionDecls spanning
macros, so it isn't that much more work to make that also work for cases called
directly from VisitFunctionDecl.

Change-Id: I529f148c8872b86aa1ef082c6cb73db8ab1866e7
Reviewed-on: https://gerrit.libreoffice.org/46367Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

compilerplugins/clang/test/salcall.cxx

@@ -117,13 +117,20 @@ class Class8_3 : public Class8_1, public Class8_2
     virtual ~Class8_3();
 };
 
-#define M1(m) void m
+#define M1(m) VOID m
 class Class9
 {
+    Class9(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
     M1(method1)(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
     void method2(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
 };
-void SAL_CALL Class9::method1() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+#define MC(num)                                                                                    \
+    Class##num::Class##num() {}
+SAL_CALL MC(9) // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+    ; // to appease clang-format
+void SAL_CALL Class9::method1() // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+{
+}
 #define M2(T) T SAL_CALL
 M2(void) Class9::method2() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
 

dbaccess/source/ui/inc/sbamultiplex.hxx

@@ -85,8 +85,8 @@ namespace dbaui
 
     #define END_DECLARE_LISTENER_MULTIPLEXER()                                              \
     /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */    \
-        void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); }   \
-        void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); }    \
+        void * operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); }   \
+        void operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); }    \
     };                                                                                      \
 
     // implementation of a listener multiplexer class

framework/inc/dispatch/mailtodispatcher.hxx

@@ -69,7 +69,7 @@ class MailToDispatcher : 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 );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,

framework/inc/dispatch/oxt_handler.hxx

@@ -64,7 +64,7 @@ class Oxt_Handler  :    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 );
 
         //  XNotifyingDispatch
 

framework/inc/dispatch/servicehandler.hxx

@@ -73,7 +73,7 @@ class ServiceHandler : 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 );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,

framework/inc/dispatch/systemexec.hxx

@@ -71,7 +71,7 @@ class SystemExec :     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 );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,

framework/inc/jobs/helponstartup.hxx

@@ -94,7 +94,7 @@ class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css
         /* 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 );
 
         // css.task.XJob
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;

framework/inc/jobs/shelljob.hxx

@@ -77,7 +77,7 @@ class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::tas
         /* 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 );
 
         // css.task.XJob
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;

framework/inc/macros/registration.hxx

@@ -52,7 +52,7 @@ ________________________________________________________________________________
 //  define method to instantiate new services
 
 #define COMPONENTGETFACTORY( LIB, IFFACTORIES )                                                                                         \
-    extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory( const sal_Char* pImplementationName,                      \
+    extern "C" SAL_DLLPUBLIC_EXPORT void* LIB##_component_getFactory( const sal_Char* pImplementationName,                      \
                                                             void*       pServiceManager     ,                                           \
                                                             void*     /*pRegistryKey*/      )                                           \
     {                                                                                                                                   \

framework/inc/macros/xserviceinfo.hxx

@@ -147,7 +147,7 @@ namespace framework{
     static css::uno::Sequence< OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                   );                                                                    \
     static OUString                                         SAL_CALL impl_getStaticImplementationName   (                                   );                                                                    \
     /* Helper for initialization of service by using own reference! */                                                                                                                                            \
-    void                                                    SAL_CALL impl_initService                   (                                   );                                                                    \
+    void                                                    impl_initService                   (                                   );                                                                    \
 
 #define DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )              \
     PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )              \
@@ -176,7 +176,7 @@ namespace framework{
 //                          }
 //                      )
 #define DEFINE_INIT_SERVICE( CLASS, FUNCTIONBODY )                                                              \
-    void SAL_CALL CLASS::impl_initService()                                                                     \
+    void CLASS::impl_initService()                                                                     \
     {                                                                                                           \
         FUNCTIONBODY                                                                                            \
     }

framework/inc/recording/dispatchrecorder.hxx

@@ -64,7 +64,7 @@ class DispatchRecorder
         /* 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 );
 
         // XDispatchRecorder
         virtual void SAL_CALL            startRecording         ( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;

framework/inc/recording/dispatchrecordersupplier.hxx

@@ -68,7 +68,7 @@ class DispatchRecorderSupplier  :   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 );
 
         // XDispatchRecorderSupplier
 

framework/inc/services/mediatypedetectionhelper.hxx

@@ -71,7 +71,7 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XS
         /* 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 );
 
         //  XStringMapping
 

framework/inc/services/uriabbreviation.hxx

@@ -41,7 +41,7 @@ public:
     /* 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 );
 
     // css::util::XStringAbbreviation:
     virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) override;

framework/inc/tabwin/tabwinfactory.hxx

@@ -48,7 +48,7 @@ class TabWinFactory :  public ::cppu::WeakImplHelper< css::lang::XSingleComponen
         /* 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 );
 
         // XSingleComponentFactory
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;

framework/inc/uielement/fontmenucontroller.hxx

@@ -49,7 +49,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() override;

framework/inc/uielement/fontsizemenucontroller.hxx

@@ -53,7 +53,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() override;

framework/inc/uielement/footermenucontroller.hxx

@@ -40,7 +40,7 @@ namespace framework
             /* 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 );
     };
 }
 

framework/inc/uielement/headermenucontroller.hxx

@@ -49,7 +49,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() override;

framework/inc/uielement/langselectionmenucontroller.hxx

@@ -51,7 +51,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() override;

framework/inc/uielement/macrosmenucontroller.hxx

@@ -50,7 +50,7 @@ namespace framework
             /* 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 );
 
             // XStatusListener
             virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;

framework/inc/uielement/newmenucontroller.hxx

@@ -54,7 +54,7 @@ namespace framework
             /* 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 >& aArguments ) override;

framework/inc/uielement/notebookbarmenucontroller.hxx

@@ -51,7 +51,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;

framework/inc/uielement/toolbarmodemenucontroller.hxx

@@ -51,7 +51,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;

framework/inc/uielement/toolbarsmenucontroller.hxx

@@ -55,7 +55,7 @@ namespace framework
             /* 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 );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;

framework/source/inc/dispatch/dispatchdisabler.hxx

@@ -92,7 +92,7 @@ public:
     /* 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 );
 };
 
 } // namespace framework

i18npool/source/registerservices/registerservices.cxx

@@ -65,7 +65,7 @@ using namespace i18npool;
 
 #define IMPL_CREATEINSTANCE( ImplName ) \
     uno::Reference< uno::XInterface >   \
-        SAL_CALL ImplName##_CreateInstance(               \
+        ImplName##_CreateInstance(               \
             SAL_UNUSED_PARAMETER const uno::Reference<    \
                     lang::XMultiServiceFactory >& )       \
 {                                                         \
@@ -76,7 +76,7 @@ using namespace i18npool;
 
 #define IMPL_CREATEINSTANCE_CTX( ImplName )               \
     uno::Reference< uno::XInterface >                     \
-        SAL_CALL ImplName##_CreateInstance(               \
+        ImplName##_CreateInstance(               \
             const uno::Reference<                         \
                     lang::XMultiServiceFactory >& rxMSF ) \
 {                                                         \

i18nutil/source/utility/unicode.cxx

@@ -114,7 +114,7 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) {
             bit(UnicodeType::PARAGRAPH_SEPARATOR)
 
 #define IsType(func, mask)  \
-bool SAL_CALL func( const sal_Unicode ch) {\
+bool func( const sal_Unicode ch) {\
     return (bit(getUnicodeType(ch)) & (mask)) != 0;\
 }
 

include/framework/dispatchhelper.hxx

@@ -80,12 +80,12 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
         static css::uno::Sequence< OUString >   SAL_CALL impl_getStaticSupportedServiceNames(                                   );
         static OUString                         SAL_CALL impl_getStaticImplementationName   (                                   );
         // Helper for initialization of service by using own reference!
-        void                                    SAL_CALL impl_initService                   (                                   );
+        void                                    impl_initService                   (                                   );
 
         // 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 );
 
 
         // XDispatchHelper

include/i18nutil/unicode.hxx

@@ -42,9 +42,9 @@ public:
     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 isControl( const sal_Unicode ch);
+    static bool isAlpha( const sal_Unicode ch);
+    static bool isSpace( const sal_Unicode ch);
     static bool isWhiteSpace( const sal_Unicode ch);
 
     //Map an ISO 15924 script code to Latin/Asian/Complex/Weak

xmloff/source/draw/sdxmlexp.cxx

@@ -2684,15 +2684,15 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
 }
 
 #define SERVICE( classname, servicename, implementationname, draw, flags )\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
 {\
     return uno::Sequence< OUString > { servicename };\
 }\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
 {\
     return OUString( implementationname );\
 }\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
 {\
     return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
 }

xmloff/source/draw/sdxmlimp.cxx

@@ -235,15 +235,15 @@ SvXMLImportContextRef SdXMLFlatDocContext_Impl::CreateChildContext(
 }
 
 #define SERVICE(classname,servicename,implementationname,draw,flags)\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
 {\
     return uno::Sequence< OUString > { servicename };\
 }\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
 {\
     return OUString( implementationname );\
 }\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
 {\
     return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
 }

xmloff/source/transform/OOo2Oasis.cxx

@@ -2004,19 +2004,19 @@ Reference< XInterface > OOo2OasisTransformer_createInstance(
 }
 
 #define OOO_IMPORTER( className, implName, subServiceName )             \
-OUString SAL_CALL className##_getImplementationName() throw()           \
+OUString className##_getImplementationName() throw()           \
 {                                                                       \
     return OUString( implName );         \
 }                                                                       \
                                                                         \
-Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\
+Sequence< OUString > className##_getSupportedServiceNames() throw()\
 {                                                                       \
     const OUString aServiceName( className##_getImplementationName() ); \
     const Sequence< OUString > aSeq( &aServiceName, 1 );                \
     return aSeq;                                                        \
 }                                                                       \
                                                                         \
-Reference< XInterface > SAL_CALL className##_createInstance(            \
+Reference< XInterface > className##_createInstance(            \
         const Reference< XMultiServiceFactory > & )                     \
 {                                                                       \
     return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName,      \