10 files changed, 18 insertions, 18 deletions
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index ef7647b171f2..4ad0b0caaf8c 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -138,10 +138,10 @@ class SwChartDataProvider :
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false );
+    css::uno::Reference< css::chart2::data::XDataSource > Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false );
+    css::uno::Reference< css::chart2::data::XDataSequence > Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false );
 
     static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation );
 
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 2d164505574b..2bd932783632 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -198,7 +198,7 @@ private:
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames );
+    css::uno::Sequence< css::uno::Any > GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames );
 
 public:
 
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index d34e132fcd89..23214c6decbc 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -111,7 +111,7 @@ public:
     virtual void SAL_CALL setFormula( const OUString& aFormula ) override;
     virtual double SAL_CALL getValue(  ) override;
     /// @throws css::uno::RuntimeException
-    double SAL_CALL getValue(  ) const
+    double getValue(  ) const
         { return const_cast<SwXCell*>(this)->getValue(); };
     virtual void SAL_CALL setValue( double nValue ) override;
     virtual css::table::CellContentType SAL_CALL getType(  ) override;
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 46e0be9ce220..c0ee49f316a3 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -629,7 +629,7 @@ uno::Reference< XAccessible> SAL_CALL
     return xChild;
 }
 
-uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParentImpl()
+uno::Reference< XAccessible> SwAccessibleContext::getAccessibleParentImpl()
 {
     SolarMutexGuard aGuard;
 
@@ -839,7 +839,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
    true: Use relative mode.
    false: Use absolute mode.
 */
-awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
+awt::Rectangle SwAccessibleContext::getBoundsImpl(bool bRelative)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 35c7ad7f1fce..efa0fc7e3c1b 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -186,7 +186,7 @@ protected:
      bool IsEditableState();
 
     /// @throws css::uno::RuntimeException
-    css::awt::Rectangle SAL_CALL
+    css::awt::Rectangle
         getBoundsImpl(bool bRelative);
 
     // #i85634#
@@ -201,7 +201,7 @@ protected:
     virtual ~SwAccessibleContext() override;
 
     // Return a reference to the parent.
-    css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
+    css::uno::Reference< css::accessibility::XAccessible>
         getAccessibleParentImpl();
 
 public:
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 2857bbd50913..525e29d76e98 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -72,7 +72,7 @@ protected:
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL AttachImpl(
+    void AttachImpl(
             const css::uno::Reference< css::text::XTextRange > & xTextRange,
             const sal_uInt16 nWhich);
 
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index b8603a30a155..25239840851f 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -127,20 +127,20 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL SetPropertyValues_Impl(
+    void SetPropertyValues_Impl(
         const css::uno::Sequence< OUString >& aPropertyNames,
         const css::uno::Sequence< css::uno::Any >& aValues );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl(
+    css::uno::Sequence< css::uno::Any > GetPropertyValues_Impl(
         const css::uno::Sequence< OUString >& aPropertyNames );
 
     void GetPropertyValue( css::uno::Any &rVal,
                 const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, std::unique_ptr<SfxItemSet> &pSet );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl(
+    css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> GetPropertyValuesTolerant_Impl(
         const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly );
 
     virtual ~SwXTextPortion() override;
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index a1e8ab795fc7..8907e236f079 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -374,7 +374,7 @@ void SwXTextPortion::GetPropertyValue(
     }
 }
 
-uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl(
+uno::Sequence< uno::Any > SwXTextPortion::GetPropertyValues_Impl(
         const uno::Sequence< OUString >& rPropertyNames )
 {
     sal_Int32 nLength = rPropertyNames.getLength();
@@ -407,7 +407,7 @@ uno::Any SwXTextPortion::getPropertyValue(
     return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0];
 }
 
-void SAL_CALL SwXTextPortion::SetPropertyValues_Impl(
+void SwXTextPortion::SetPropertyValues_Impl(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues )
 {
@@ -571,7 +571,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
     return GetPropertyValuesTolerant_Impl( rPropertyNames, true );
 }
 
-uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl(
+uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXTextPortion::GetPropertyValuesTolerant_Impl(
         const uno::Sequence< OUString >& rPropertyNames,
         bool bDirectValuesOnly )
 {
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 2510c4e7bfe5..3722a5296ea7 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -949,7 +949,7 @@ SwXMeta::dispose()
     }
 }
 
-void SAL_CALL
+void
 SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange,
         const sal_uInt16 i_nWhich)
 {
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 0a587b80f129..ec5197cbbfcd 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -146,13 +146,13 @@ public:
     /// @throws lang::IllegalArgumentException
     /// @throws lang::WrappedTargetException,
     /// @throws uno::RuntimeException
-    void SAL_CALL SetPropertyValues_Impl(
+    void SetPropertyValues_Impl(
             const uno::Sequence< OUString >& rPropertyNames,
             const uno::Sequence< uno::Any >& aValues);
     /// @throws beans::UnknownPropertyException
     /// @throws lang::WrappedTargetException,
     /// @throws uno::RuntimeException
-    uno::Sequence< uno::Any > SAL_CALL
+    uno::Sequence< uno::Any >
         GetPropertyValues_Impl(
             const uno::Sequence< OUString >& rPropertyNames);
 protected: