loplugin:salcall fix non-virtual methods

first, since those are safer to change than virtual methods

Change-Id: Ie3b624019d75ee2b793cee33b3c5f64e994e8bfe
Reviewed-on: https://gerrit.libreoffice.org/45798
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

22 files changed, 86 insertions, 86 deletions

diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index e7ac2fa157a6..963bea96bf17 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -57,15 +57,15 @@ namespace comphelper
 
             @throws css::uno::RuntimeException
         */
-        bool SAL_CALL containsPoint( const css::awt::Point& aPoint );
+        bool containsPoint( const css::awt::Point& aPoint );
         /// @throws css::uno::RuntimeException
-        css::awt::Point SAL_CALL getLocation(  );
+        css::awt::Point getLocation(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Point SAL_CALL getLocationOnScreen(  );
+        css::awt::Point getLocationOnScreen(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Size SAL_CALL getSize(  );
+        css::awt::Size getSize(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Rectangle SAL_CALL getBounds(  );
+        css::awt::Rectangle getBounds(  );
     };
 
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index d96347f51bb8..c4e060e2b664 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -71,22 +71,22 @@ namespace comphelper
             @throws css::lang::IndexOutOfBoundsException
             @throws css::uno::RuntimeException
         */
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex );
+        void selectAccessibleChild( sal_Int32 nChildIndex );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex );
+        bool isAccessibleChildSelected( sal_Int32 nChildIndex );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL clearAccessibleSelection(  );
+        void clearAccessibleSelection(  );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL selectAllAccessibleChildren(  );
+        void selectAllAccessibleChildren(  );
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  );
+        sal_Int32 getSelectedAccessibleChildCount(  );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex );
+        css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex );
+        void deselectAccessibleChild( sal_Int32 nSelectedChildIndex );
     };
 
 
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index e522448132cd..60fe555efb87 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -69,23 +69,23 @@ namespace comphelper
             @throws css::lang::IndexOutOfBoundsException
             @throws css::uno::RuntimeException
         */
-        OUString SAL_CALL getSelectedText();
+        OUString getSelectedText();
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectionStart();
+        sal_Int32 getSelectionStart();
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectionEnd();
+        sal_Int32 getSelectionEnd();
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType );
+        css::accessibility::TextSegment getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType );
+        css::accessibility::TextSegment getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType );
+        css::accessibility::TextSegment getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType );
 
     public:
 
diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index 4439dbfc5da6..d65cb78c0a25 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -88,20 +88,20 @@ public:
     ~OInterfaceIteratorHelper2();
 
     /** Return true, if there are more elements in the iterator. */
-    bool SAL_CALL hasMoreElements() const
+    bool hasMoreElements() const
         { return nRemain != 0; }
     /** Return the next element of the iterator. Calling this method if
         hasMoreElements() has returned false, is an error. Cast the
         returned pointer to the
      */
-    css::uno::XInterface * SAL_CALL next();
+    css::uno::XInterface * next();
 
     /** Removes the current element (the last one returned by next())
         from the underlying container. Calling this method before
         next() has been called or calling it twice with no next()
         inbetween is an error.
     */
-    void SAL_CALL remove();
+    void remove();
 
 private:
     OInterfaceContainerHelper2 & rCont;
@@ -152,12 +152,12 @@ public:
       Return the number of Elements in the container. Only useful if you have acquired
       the mutex.
      */
-    sal_Int32 SAL_CALL getLength() const;
+    sal_Int32 getLength() const;
 
     /**
       Return all interfaces added to this container.
      **/
-    std::vector< css::uno::Reference< css::uno::XInterface > > SAL_CALL getElements() const;
+    std::vector< css::uno::Reference< css::uno::XInterface > > getElements() const;
 
     /** Inserts an element into the container.  The position is not specified, thus it is not
         specified in which order events are fired.
@@ -175,7 +175,7 @@ public:
         @return
                 the new count of elements in the container
     */
-    sal_Int32 SAL_CALL addInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace );
+    sal_Int32 addInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace );
     /** Removes an element from the container.  It uses interface equality to remove the interface.
 
         @param rxIFace
@@ -183,16 +183,16 @@ public:
         @return
                 the new count of elements in the container
     */
-    sal_Int32 SAL_CALL removeInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace );
+    sal_Int32 removeInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace );
     /**
       Call disposing on all object in the container that
       support XEventListener. Than clear the container.
      */
-    void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt );
+    void disposeAndClear( const css::lang::EventObject & rEvt );
     /**
       Clears the container without calling disposing().
      */
-    void SAL_CALL clear();
+    void clear();
 
     /** Executes a functor for each contained listener of specified type, e.g.
         <code>forEach<awt::XPaintListener>(...</code>.
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index cf2790a88ae6..2cbd8bb89bcb 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -104,7 +104,7 @@ namespace param
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
         // pseudo-XComponent
-        void SAL_CALL dispose();
+        void dispose();
 
     protected:
         virtual ~ParameterWrapper() override;
diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx
index 978c9892ed95..1a57ed058f95 100644
--- a/include/connectivity/warningscontainer.hxx
+++ b/include/connectivity/warningscontainer.hxx
@@ -67,8 +67,8 @@ namespace dbtools
         void appendWarning(const css::sdb::SQLContext& _rContext);
 
         // XWarningsSupplier equivalents
-        css::uno::Any SAL_CALL getWarnings(  ) const;
-        void SAL_CALL clearWarnings(  );
+        css::uno::Any getWarnings(  ) const;
+        void clearWarnings(  );
     };
 
 
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 321fa2ad5826..87953d7df413 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -261,35 +261,35 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 );
+    void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 );
+    css::uno::Any _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 );
 
     /// @throws css::beans::PropertyVetoException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 );
+    void _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Any > SAL_CALL _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 );
+    css::uno::Sequence< css::uno::Any > _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 );
+    css::beans::PropertyState _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 );
+    css::beans::PropertyState _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::beans::PropertyState > SAL_CALL _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1  );
+    css::uno::Sequence< css::beans::PropertyState > _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1  );
     // returns true if property found or false if unknown property
     static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, css::beans::PropertyState& rState);
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 );
+    void _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
     void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara );
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index c4f58b5a2976..283cf2d34dc8 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -98,7 +98,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
 
         // not a public XDispatchHelper-method, need in sfx2/source/control/statcach.cxx for extensions
         /// @throws css::uno::RuntimeException
-        css::uno::Any SAL_CALL executeDispatch(
+        css::uno::Any executeDispatch(
                                         const css::uno::Reference< css::frame::XDispatch >&  xDispatch      ,
                                         const  css::util::URL&                                  aURL        ,
                                         bool                                                    SyncronFlag ,
diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx
index dc2e6df699af..9d88997f5be6 100644
--- a/include/package/Deflater.hxx
+++ b/include/package/Deflater.hxx
@@ -43,15 +43,15 @@ class DLLPUBLIC_PACKAGE Deflater final
 public:
     ~Deflater();
     Deflater(sal_Int32 nSetLevel, bool bNowrap);
-    void SAL_CALL setInputSegment( const css::uno::Sequence< sal_Int8 >& rBuffer );
-    bool SAL_CALL needsInput(  );
-    void SAL_CALL finish(  );
-    bool SAL_CALL finished(  ) { return bFinished;}
-    sal_Int32 SAL_CALL doDeflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
-    sal_Int64 SAL_CALL getTotalIn(  );
-    sal_Int64 SAL_CALL getTotalOut(  );
-    void SAL_CALL reset(  );
-    void SAL_CALL end(  );
+    void setInputSegment( const css::uno::Sequence< sal_Int8 >& rBuffer );
+    bool needsInput(  );
+    void finish(  );
+    bool finished(  ) { return bFinished;}
+    sal_Int32 doDeflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
+    sal_Int64 getTotalIn(  );
+    sal_Int64 getTotalOut(  );
+    void reset(  );
+    void end(  );
 };
 
 }
diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx
index c978c8a8c918..ebec98734f3f 100644
--- a/include/package/Inflater.hxx
+++ b/include/package/Inflater.hxx
@@ -40,11 +40,11 @@ class DLLPUBLIC_PACKAGE Inflater final
 public:
     Inflater(bool bNoWrap);
     ~Inflater();
-    void SAL_CALL setInput( const css::uno::Sequence< sal_Int8 >& rBuffer );
-    bool SAL_CALL needsDictionary(  ) { return bNeedDict;}
-    bool SAL_CALL finished(  ) { return bFinished;}
-    sal_Int32 SAL_CALL doInflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
-    void SAL_CALL end(  );
+    void setInput( const css::uno::Sequence< sal_Int8 >& rBuffer );
+    bool needsDictionary(  ) { return bNeedDict;}
+    bool finished(  ) { return bFinished;}
+    sal_Int32 doInflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
+    void end(  );
 
     sal_Int32 getLastInflateError() { return nLastInflateError; }
 };
diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx
index dde4bce872ec..4e2a1c17738a 100644
--- a/include/sax/tools/documenthandleradapter.hxx
+++ b/include/sax/tools/documenthandleradapter.hxx
@@ -81,12 +81,12 @@ namespace sax
         ;
 
     protected:
-        void SAL_CALL
+        void
         setDelegate(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate)
         {
             m_handler = delegate;
         }
-        const css::uno::Reference< css::xml::sax::XDocumentHandler >& SAL_CALL
+        const css::uno::Reference< css::xml::sax::XDocumentHandler >&
         getDelegate()
         {
             return m_handler;
@@ -191,12 +191,12 @@ namespace sax
         {
         }
 
-        void SAL_CALL
+        void
         setDelegate(const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate)
         {
             m_handler = delegate;
         }
-        const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& SAL_CALL
+        const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >&
         getDelegate()
         {
             return m_handler;
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 9fd312f87123..d05ab0e24cdb 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -202,14 +202,14 @@ public:
     const css::uno::Reference < css::ui::dialogs::XFilePicker3 >& GetFilePicker() const;
 
     // XFilePickerListener methods
-    void SAL_CALL   FileSelectionChanged();
-    void SAL_CALL   DirectoryChanged();
+    void   FileSelectionChanged();
+    void   DirectoryChanged();
     virtual void SAL_CALL   ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
-    void SAL_CALL   DialogSizeChanged();
+    void   DialogSizeChanged();
     static OUString SAL_CALL    HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
 
     // XDialogClosedListener methods
-    void SAL_CALL   DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
+    void   DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
 
     /** sets help ids for the controls in the dialog
         @param _pControlId
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index a9768ade13fa..7f64e5a393d2 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -134,11 +134,11 @@ public:
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
     void                setMasterSlaveCommand( bool bSet );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL       dispatch( const css::util::URL& aURL,
+    void       dispatch( const css::util::URL& aURL,
                                   const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
                                   const css::uno::Reference< css::frame::XDispatchResultListener >& rListener );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL       addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL);
+    void       addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL);
     void                UnBindController();
     SfxDispatcher*      GetDispatcher();
     void                SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 5e47c7e076ef..2f814bdfa920 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -67,7 +67,7 @@ public:
         const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName );
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL
+    bool
         isVisible();
 
     //=====  XAccessible  =====================================================
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index f9ee89f0cec9..ff4b62f04313 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -100,7 +100,7 @@ namespace svt
             void throwIfDisposed();
 
             /** helper method to cause statusChanged is called once for the given command url */
-            void SAL_CALL updateCommand( const OUString& rCommandURL );
+            void updateCommand( const OUString& rCommandURL );
 
             /** this function is called upon disposing the component
             */
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 5b20b105ef1e..cfac0bebfe03 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -83,8 +83,8 @@ public:
         const AccessibleShapeTreeInfo& rShapeTreeInfo);
     virtual ~AccessibleControlShape( ) override;
 
-    const css::uno::Reference< css::beans::XPropertySet >& SAL_CALL  GetControlModel( ) { return m_xControlModel;} ;
-    AccessibleControlShape* SAL_CALL GetLabeledByControlShape();
+    const css::uno::Reference< css::beans::XPropertySet >&  GetControlModel( ) { return m_xControlModel;} ;
+    AccessibleControlShape* GetLabeledByControlShape();
 
 private:
     //---  XAccessibleComponent  -------------------------------
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index 3a8f04f523ee..d80050375e68 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -350,7 +350,7 @@ namespace accessibility
             @attention Don't call with locked mutexes. You may hold
             the solar mutex, but this method acquires it anyway.
         */
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL GetAt( const css::awt::Point& aPoint );
+        css::uno::Reference< css::accessibility::XAccessible > GetAt( const css::awt::Point& aPoint );
 
     private:
 
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index f82899aca673..d85c639a46c1 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -109,7 +109,7 @@ public:
     virtual void KeyInput( const KeyEvent& rKEvt ) override;
 
     // css::beans::XPropertyChangeListener
-    void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt);
+    void propertyChange(const css::beans::PropertyChangeEvent& evt);
 
     // css::form::XPositioningListener
     void positioned();
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 7f6b618e8f25..e9475788c84a 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -148,7 +148,7 @@ protected:
 
     css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const;
 
-    bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName );
+    bool SetFillAttribute( sal_Int32 nWID, const OUString& rName );
 
     /** called from the XActionLockable interface methods on initial locking */
     virtual void lock();
@@ -228,34 +228,34 @@ public:
 
     // access methods for master objects
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo(  );
+    css::uno::Reference< css::beans::XPropertySetInfo > _getPropertySetInfo(  );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::PropertyVetoException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue );
+    void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName );
+    css::uno::Any _getPropertyValue( const OUString& PropertyName );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName );
+    css::beans::PropertyState _getPropertyState( const OUString& PropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName );
+    void _setPropertyToDefault( const OUString& PropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName );
+    css::uno::Any _getPropertyDefault( const OUString& aPropertyName );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
+    css::uno::Sequence< OUString > _getSupportedServiceNames();
 
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes(  );
+    css::uno::Sequence< css::uno::Type > _getTypes(  );
 
     void setMaster( SvxShapeMaster* pMaster );
 
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 81b6a45e6766..b6b9250a8b84 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -659,9 +659,9 @@ public:
 
     // why isn't this part of the XScrollbar?
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setMinimum( sal_Int32 n );
+    void setMinimum( sal_Int32 n );
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL getMinimum(  );
+    sal_Int32 getMinimum(  );
 
     // css::awt::VclWindowPeer
     void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 5481797ff4b5..1645b81089f0 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -548,7 +548,7 @@ public:
     // XAuthFallback
     virtual void SAL_CALL setCode( const OUString& code ) override;
     /// @throws css::uno::RuntimeException
-    const OUString& SAL_CALL getCode() const;
+    const OUString& getCode() const;
 
 
 };
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index e7bac7bcb071..92ac0ed3b2a4 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -50,33 +50,33 @@ public:
 
         @param xElem element reference
     */
-    void SAL_CALL addSubElement(
+    void addSubElement(
         css::uno::Reference< css::xml::sax::XAttributeList > const & xElem );
 
     /** Gets sub element of given index.  The index follows order in which sub elements were added.
 
         @param nIndex index of sub element
     */
-    css::uno::Reference< css::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex );
+    css::uno::Reference< css::xml::sax::XAttributeList > getSubElement( sal_Int32 nIndex );
 
     /** Adds an attribute to elements.
 
         @param rAttrName qname of attribute
         @param rValue value string of element
     */
-    void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue );
+    void addAttribute( OUString const & rAttrName, OUString const & rValue );
 
     /** Dumps out element (and all sub elements).
 
         @param xOut document handler to be written to
     */
-    void SAL_CALL dump(
+    void dump(
         css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut );
     /** Dumps out sub elements (and all further sub elements).
 
         @param xOut document handler to be written to
     */
-    void SAL_CALL dumpSubElements(
+    void dumpSubElements(
         css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut );
 
     // XAttributeList