loplugin:salcall handle virtual methods

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

27 files changed, 180 insertions, 180 deletions

diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index c6c2ddf8883b..974256ee2c90 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -47,32 +47,32 @@ void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet)
     construct(_xDriverSet, m_sRowSetFilter);
 }
 
-Any SAL_CALL OBookmarkSet::getBookmark()
+Any OBookmarkSet::getBookmark()
 {
     return m_xRowLocate->getBookmark();
 }
 
-bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark )
+bool OBookmarkSet::moveToBookmark( const Any& bookmark )
 {
     return m_xRowLocate->moveToBookmark(bookmark);
 }
 
-sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     return m_xRowLocate->compareBookmarks(_first,_second);
 }
 
-bool SAL_CALL OBookmarkSet::hasOrderedBookmarks(  )
+bool OBookmarkSet::hasOrderedBookmarks(  )
 {
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
-sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark )
+sal_Int32 OBookmarkSet::hashBookmark( const Any& bookmark )
 {
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
-void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
@@ -96,7 +96,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
         ::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
 }
 
-void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
+void OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
@@ -119,7 +119,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
         ::dbtools::throwSQLException( DBA_RES( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
 }
 
-void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
+void OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
 {
     Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
 
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 8c34c2e0156b..b25a7efe73bc 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -42,15 +42,15 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+        virtual css::uno::Any getBookmark() override;
+        virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index 0931179875d2..ed713db72a53 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -82,7 +82,7 @@ void OIndexes::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
         OIndexesHelper::dropObject(_nPos,_sElementName);
 }
 
-void SAL_CALL OIndexes::disposing()
+void OIndexes::disposing()
 {
     if ( m_xIndexes.is() )
         clear_NoDispose();
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index a71b0f376cc6..0ee3d5ced152 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -41,7 +41,7 @@ namespace dbaccess
             ,m_xIndexes(_rxIndexes)
         {}
 
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
     };
 }
 
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 529358055d9f..14970364a798 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -219,7 +219,7 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName)
     return xNamed;
 }
 
-void SAL_CALL ORowSetDataColumns::disposing()
+void ORowSetDataColumns::disposing()
 {
     ORowSetDataColumns_BASE::disposing();
     m_aColumns = nullptr;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 60983220408c..83fae4e89c10 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -92,7 +92,7 @@ namespace dbaccess
                         );
         virtual ~ORowSetDataColumns() override;
         // only the name is identical to ::cppu::OComponentHelper
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
         void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector);
     };
 }
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 96ec66e59337..785cba2a69cc 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -148,7 +148,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)
     }
 }
 
-void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -271,7 +271,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
     }
 }
 
-void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
+void OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -315,7 +315,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
      m_bUpdated = xPrep->executeUpdate() > 0;
 }
 
-void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
+void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -494,58 +494,58 @@ Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex )
 }
 
 // XResultSet
-bool SAL_CALL OCacheSet::next()
+bool OCacheSet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->next();
 }
 
-bool SAL_CALL OCacheSet::isBeforeFirst(  )
+bool OCacheSet::isBeforeFirst(  )
 {
     return m_xDriverSet->isBeforeFirst();
 }
 
-bool SAL_CALL OCacheSet::isAfterLast(  )
+bool OCacheSet::isAfterLast(  )
 {
     return m_xDriverSet->isAfterLast();
 }
 
-void SAL_CALL OCacheSet::beforeFirst(  )
+void OCacheSet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_xDriverSet->beforeFirst();
 }
 
-void SAL_CALL OCacheSet::afterLast(  )
+void OCacheSet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_xDriverSet->afterLast();
 }
 
-bool SAL_CALL OCacheSet::first()
+bool OCacheSet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->first();
 }
 
-bool SAL_CALL OCacheSet::last()
+bool OCacheSet::last()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->last();
 }
 
-sal_Int32 SAL_CALL OCacheSet::getRow(  )
+sal_Int32 OCacheSet::getRow(  )
 {
     return m_xDriverSet->getRow();
 }
 
-bool SAL_CALL OCacheSet::absolute( sal_Int32 row )
+bool OCacheSet::absolute( sal_Int32 row )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->absolute(row);
 }
 
-bool SAL_CALL OCacheSet::previous(  )
+bool OCacheSet::previous(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->previous();
@@ -566,22 +566,22 @@ bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ )
     return absolute(row);
 }
 
-void SAL_CALL OCacheSet::refreshRow(  )
+void OCacheSet::refreshRow(  )
 {
     m_xDriverSet->refreshRow();
 }
 
-bool SAL_CALL OCacheSet::rowUpdated(  )
+bool OCacheSet::rowUpdated(  )
 {
     return m_xDriverSet->rowUpdated();
 }
 
-bool SAL_CALL OCacheSet::rowInserted(  )
+bool OCacheSet::rowInserted(  )
 {
     return m_xDriverSet->rowInserted();
 }
 
-bool SAL_CALL OCacheSet::rowDeleted(  )
+bool OCacheSet::rowDeleted(  )
 {
     return m_xDriverSet->rowDeleted();
 }
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 5f2c50da9a90..ddfef905cdc8 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -104,72 +104,72 @@ namespace dbaccess
         // css::sdbc::XResultSet
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL next();
+        virtual bool next();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL isBeforeFirst(  );
+        virtual bool isBeforeFirst(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL isAfterLast(  );
+        virtual bool isAfterLast(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL beforeFirst(  );
+        virtual void beforeFirst(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL afterLast(  );
+        virtual void afterLast(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL first();
+        virtual bool first();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL last();
+        virtual bool last();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL getRow(  );
+        virtual sal_Int32 getRow(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL absolute( sal_Int32 row );
+        virtual bool absolute( sal_Int32 row );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL previous(  );
+        virtual bool previous(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL refreshRow(  );
+        virtual void refreshRow(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowUpdated(  );
+        virtual bool rowUpdated(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowInserted(  );
+        virtual bool rowInserted(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowDeleted(  );
+        virtual bool rowDeleted(  );
         // css::sdbcx::XRowLocate
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual css::uno::Any SAL_CALL getBookmark() = 0;
+        virtual css::uno::Any getBookmark() = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) = 0;
+        virtual bool moveToBookmark( const css::uno::Any& bookmark ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0;
+        virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) = 0;
+        virtual bool hasOrderedBookmarks(  ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) = 0;
+        virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) = 0;
         // css::sdbc::XResultSetUpdate
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable );
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable );
+        virtual void updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0;
+        virtual void deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0;
 
         virtual bool isResultSetChanged() const;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0;
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 52d436fcd362..2a873c862718 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -67,7 +67,7 @@ namespace dbaccess
         return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, false );
     }
 
-    void SAL_CALL OPrivateColumns::disposing()
+    void OPrivateColumns::disposing()
     {
         m_aColumns = nullptr;
         clear_NoDispose();
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 32adb2b2759a..1e6da30e68b7 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -70,7 +70,7 @@ namespace dbaccess
             ::osl::Mutex& _rMutex
         );
 
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
     };
     typedef connectivity::sdbcx::OCollection OPrivateTables_BASE;
 
@@ -95,7 +95,7 @@ namespace dbaccess
                         ,m_aTables(_rTables)
         {
         }
-        virtual void SAL_CALL disposing() override
+        virtual void disposing() override
         {
             clear_NoDispose();
                 // we're not owner of the objects we're holding, instead the object we got in our ctor is
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 6c9bc6964d45..2a8584cc6455 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -413,14 +413,14 @@ void OKeySet::invalidateRow()
     ::comphelper::disposeComponent(m_xSet);
 }
 
-Any SAL_CALL OKeySet::getBookmark()
+Any OKeySet::getBookmark()
 {
     OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(),
         "getBookmark is only possible when we stand on a valid row!");
     return makeAny(m_aKeyIter->first);
 }
 
-bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark )
+bool OKeySet::moveToBookmark( const Any& bookmark )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
@@ -428,7 +428,7 @@ bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark )
     return m_aKeyIter != m_aKeyMap.end();
 }
 
-sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OKeySet::compareBookmarks( const Any& _first, const Any& _second )
 {
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
@@ -437,18 +437,18 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
     return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL;
 }
 
-bool SAL_CALL OKeySet::hasOrderedBookmarks(  )
+bool OKeySet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark )
+sal_Int32 OKeySet::hashBookmark( const Any& bookmark )
 {
     return ::comphelper::getINT32(bookmark);
 }
 
 
-void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
+void OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -617,7 +617,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
     }
 }
 
-void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -861,7 +861,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
     }
 }
 
-void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   )
+void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -1003,7 +1003,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
     return xKeyColumns;
 }
 
-bool SAL_CALL OKeySet::next()
+bool OKeySet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -1031,24 +1031,24 @@ bool SAL_CALL OKeySet::next()
     return !isAfterLast();
 }
 
-bool SAL_CALL OKeySet::isBeforeFirst(  )
+bool OKeySet::isBeforeFirst(  )
 {
     return m_aKeyIter == m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::isAfterLast(  )
+bool OKeySet::isAfterLast(  )
 {
     return  m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
 }
 
-void SAL_CALL OKeySet::beforeFirst(  )
+void OKeySet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.begin();
     invalidateRow();
 }
 
-void SAL_CALL OKeySet::afterLast(  )
+void OKeySet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
@@ -1056,7 +1056,7 @@ void SAL_CALL OKeySet::afterLast(  )
     invalidateRow();
 }
 
-bool SAL_CALL OKeySet::first()
+bool OKeySet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.begin();
@@ -1074,7 +1074,7 @@ bool SAL_CALL OKeySet::first()
     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::last(  )
+bool OKeySet::last(  )
 {
     return last_checked(true);
 }
@@ -1093,7 +1093,7 @@ bool OKeySet::last_checked( bool /* i_bFetchRow */ )
     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
 }
 
-sal_Int32 SAL_CALL OKeySet::getRow(  )
+sal_Int32 OKeySet::getRow(  )
 {
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -1101,7 +1101,7 @@ sal_Int32 SAL_CALL OKeySet::getRow(  )
     return std::distance(m_aKeyMap.begin(),m_aKeyIter);
 }
 
-bool SAL_CALL OKeySet::absolute( sal_Int32 row )
+bool OKeySet::absolute( sal_Int32 row )
 {
     return absolute_checked(row,true);
 }
@@ -1176,7 +1176,7 @@ bool OKeySet::previous_checked( bool /* i_bFetchRow */ )
     return m_aKeyIter != m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::previous(  )
+bool OKeySet::previous(  )
 {
     return previous_checked(true);
 }
@@ -1225,7 +1225,7 @@ bool OKeySet::doTryRefetch_throw()
     return m_xSet->next();
 }
 
-void SAL_CALL OKeySet::refreshRow()
+void OKeySet::refreshRow()
 {
     invalidateRow();
 
@@ -1466,17 +1466,17 @@ Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex )
     return m_xRow->getArray(columnIndex);
 }
 
-bool SAL_CALL OKeySet::rowUpdated(  )
+bool OKeySet::rowUpdated(  )
 {
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
 }
 
-bool SAL_CALL OKeySet::rowInserted(  )
+bool OKeySet::rowInserted(  )
 {
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
 }
 
-bool SAL_CALL OKeySet::rowDeleted(  )
+bool OKeySet::rowDeleted(  )
 {
     bool bDeleted = m_bDeleted;
     m_bDeleted = false;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 45262f53d5d3..bea06818dbe9 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -182,39 +182,39 @@ namespace dbaccess
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
 
-        virtual bool SAL_CALL rowUpdated(  ) override;
-        virtual bool SAL_CALL rowInserted(  ) override;
-        virtual bool SAL_CALL rowDeleted(  ) override;
+        virtual bool rowUpdated(  ) override;
+        virtual bool rowInserted(  ) override;
+        virtual bool rowDeleted(  ) override;
         // css::sdbc::XResultSet
-        virtual bool SAL_CALL next() override;
-        virtual bool SAL_CALL isBeforeFirst(  ) override;
-        virtual bool SAL_CALL isAfterLast(  ) override;
-        virtual void SAL_CALL beforeFirst(  ) override;
-        virtual void SAL_CALL afterLast(  ) override;
-        virtual bool SAL_CALL first() override;
-        virtual bool SAL_CALL last(  ) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) override;
-        virtual bool SAL_CALL absolute( sal_Int32 row ) override;
-        virtual bool SAL_CALL previous(  ) override;
+        virtual bool next() override;
+        virtual bool isBeforeFirst(  ) override;
+        virtual bool isAfterLast(  ) override;
+        virtual void beforeFirst(  ) override;
+        virtual void afterLast(  ) override;
+        virtual bool first() override;
+        virtual bool last(  ) override;
+        virtual sal_Int32 getRow(  ) override;
+        virtual bool absolute( sal_Int32 row ) override;
+        virtual bool previous(  ) override;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
         void ensureRowForData(  );
-        virtual void SAL_CALL refreshRow(  ) override;
+        virtual void refreshRow(  ) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() override;
+        virtual css::uno::Any getBookmark() override;
 
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
 
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
 
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual bool hasOrderedBookmarks(  ) override;
 
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
 
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
 
 
         virtual bool previous_checked( bool i_bFetchRow ) override;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index f67491fc69b9..0d8383cd8b07 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -167,7 +167,7 @@ void OptimisticSet::makeNewStatement( )
     ::comphelper::disposeComponent(xAnalyzer);
 }
 
-void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
+void OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     if ( m_aJoinedKeyColumns.empty() )
         throw SQLException();
@@ -236,7 +236,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
     }
 }
 
-void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     TSQLStatements aSql;
     TSQLStatements aParameter;
@@ -331,7 +331,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
     }
 }
 
-void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/   )
+void OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/   )
 {
     OUString aQuote  = getIdentifierQuoteString();
     TSQLStatements aKeyConditions;
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 417ab833e48f..d64d75a0b8fb 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -59,9 +59,9 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
 
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
 
         // CacheSet
         virtual bool isResultSetChanged() const override;
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 39ad1bbb0e9e..015bcce47b08 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -44,18 +44,18 @@ void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
 }
 
 // css::sdbcx::XRowLocate
-Any SAL_CALL OStaticSet::getBookmark()
+Any OStaticSet::getBookmark()
 {
     return makeAny(getRow());
 }
 
-bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark )
+bool OStaticSet::moveToBookmark( const Any& bookmark )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return absolute(::comphelper::getINT32(bookmark));
 }
 
-sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 OStaticSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
@@ -63,12 +63,12 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _
     return (nFirst < nSecond) ? CompareBookmark::LESS : ((nFirst > nSecond) ? CompareBookmark::GREATER : CompareBookmark::EQUAL);
 }
 
-bool SAL_CALL OStaticSet::hasOrderedBookmarks(  )
+bool OStaticSet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark )
+sal_Int32 OStaticSet::hashBookmark( const Any& bookmark )
 {
     return ::comphelper::getINT32(bookmark);
 }
@@ -108,7 +108,7 @@ void OStaticSet::fillAllRows()
 }
 
 // XResultSet
-bool SAL_CALL OStaticSet::next()
+bool OStaticSet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -125,30 +125,30 @@ bool SAL_CALL OStaticSet::next()
     return !isAfterLast();
 }
 
-bool SAL_CALL OStaticSet::isBeforeFirst(  )
+bool OStaticSet::isBeforeFirst(  )
 {
     return m_aSetIter == m_aSet.begin();
 }
 
-bool SAL_CALL OStaticSet::isAfterLast(  )
+bool OStaticSet::isAfterLast(  )
 {
     return m_aSetIter == m_aSet.end() && m_bEnd;
 }
 
-void SAL_CALL OStaticSet::beforeFirst(  )
+void OStaticSet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aSetIter = m_aSet.begin();
 }
 
-void SAL_CALL OStaticSet::afterLast(  )
+void OStaticSet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
     m_aSetIter = m_aSet.end();
 }
 
-bool SAL_CALL OStaticSet::first()
+bool OStaticSet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aSetIter = m_aSet.begin()+1;
@@ -158,7 +158,7 @@ bool SAL_CALL OStaticSet::first()
     return m_aSetIter != m_aSet.end();
 }
 
-bool SAL_CALL OStaticSet::last()
+bool OStaticSet::last()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
@@ -167,7 +167,7 @@ bool SAL_CALL OStaticSet::last()
     return !isBeforeFirst() && !isAfterLast();
 }
 
-sal_Int32 SAL_CALL OStaticSet::getRow(  )
+sal_Int32 OStaticSet::getRow(  )
 {
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -177,7 +177,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow(  )
     return nPos;
 }
 
-bool SAL_CALL OStaticSet::absolute( sal_Int32 row )
+bool OStaticSet::absolute( sal_Int32 row )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!");
@@ -217,7 +217,7 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row )
     return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin();
 }
 
-bool SAL_CALL OStaticSet::previous(  )
+bool OStaticSet::previous(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -227,26 +227,26 @@ bool SAL_CALL OStaticSet::previous(  )
     return m_aSetIter != m_aSet.begin();
 }
 
-void SAL_CALL OStaticSet::refreshRow(  )
+void OStaticSet::refreshRow(  )
 {
 }
 
-bool SAL_CALL OStaticSet::rowUpdated(  )
+bool OStaticSet::rowUpdated(  )
 {
     return m_bUpdated;
 }
 
-bool SAL_CALL OStaticSet::rowInserted(  )
+bool OStaticSet::rowInserted(  )
 {
     return m_bInserted;
 }
 
-bool SAL_CALL OStaticSet::rowDeleted(  )
+bool OStaticSet::rowDeleted(  )
 {
     return m_bDeleted;
 }
 
-void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
+void OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     OCacheSet::insertRow( _rInsertRow,_xTable);
     if(m_bInserted)
@@ -258,7 +258,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect
     }
 }
 
-void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
+void OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
 {
     OCacheSet::deleteRow(_rDeleteRow,_xTable);
     if(m_bDeleted)
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 064d789f3f7d..92f4d55ce7b0 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -45,30 +45,30 @@ namespace dbaccess
 
         virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+        virtual css::uno::Any getBookmark() override;
+        virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
 
         // css::sdbc::XResultSet
-        virtual bool SAL_CALL next() override;
-        virtual bool SAL_CALL isBeforeFirst(  ) override;
-        virtual bool SAL_CALL isAfterLast(  ) override;
-        virtual void SAL_CALL beforeFirst(  ) override;
-        virtual void SAL_CALL afterLast(  ) override;
-        virtual bool SAL_CALL first() override;
-        virtual bool SAL_CALL last() override;
-        virtual sal_Int32 SAL_CALL getRow(  ) override;
-        virtual bool SAL_CALL absolute( sal_Int32 row ) override;
-        virtual bool SAL_CALL previous(  ) override;
-        virtual void SAL_CALL refreshRow(  ) override;
-        virtual bool SAL_CALL rowUpdated(  ) override;
-        virtual bool SAL_CALL rowInserted(  ) override;
-        virtual bool SAL_CALL rowDeleted(  ) override;
+        virtual bool next() override;
+        virtual bool isBeforeFirst(  ) override;
+        virtual bool isAfterLast(  ) override;
+        virtual void beforeFirst(  ) override;
+        virtual void afterLast(  ) override;
+        virtual bool first() override;
+        virtual bool last() override;
+        virtual sal_Int32 getRow(  ) override;
+        virtual bool absolute( sal_Int32 row ) override;
+        virtual bool previous(  ) override;
+        virtual void refreshRow(  ) override;
+        virtual bool rowUpdated(  ) override;
+        virtual bool rowInserted(  ) override;
+        virtual bool rowDeleted(  ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable  ) override;
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable  ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index ddbe9cc23e3a..15f935d0c048 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -49,7 +49,7 @@ void WrappedResultSet::reset(const Reference< XResultSet>& _xDriverSet)
     construct(_xDriverSet, m_sRowSetFilter);
 }
 
-Any SAL_CALL WrappedResultSet::getBookmark()
+Any WrappedResultSet::getBookmark()
 {
     if ( m_xRowLocate.is() )
     {
@@ -58,27 +58,27 @@ Any SAL_CALL WrappedResultSet::getBookmark()
     return makeAny(m_xDriverSet->getRow());
 }
 
-bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark )
+bool WrappedResultSet::moveToBookmark( const Any& bookmark )
 {
     return m_xRowLocate->moveToBookmark( bookmark );
 }
 
-sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second )
+sal_Int32 WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     return m_xRowLocate->compareBookmarks( _first,_second );
 }
 
-bool SAL_CALL WrappedResultSet::hasOrderedBookmarks(  )
+bool WrappedResultSet::hasOrderedBookmarks(  )
 {
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
-sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark )
+sal_Int32 WrappedResultSet::hashBookmark( const Any& bookmark )
 {
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
-void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
+void WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     m_xUpd->moveToInsertRow();
     sal_Int32 i = 1;
@@ -92,7 +92,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
     (*_rInsertRow->get().begin()) = getBookmark();
 }
 
-void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
+void WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     sal_Int32 i = 1;
     connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
@@ -105,7 +105,7 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O
     m_xUpd->updateRow();
 }
 
-void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
+void WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
 {
     m_xUpd->deleteRow();
 }
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index 7d5608637c49..96a82b3780ce 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -45,15 +45,15 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
+        virtual css::uno::Any getBookmark() override;
+        virtual bool moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index ee2df90ae9cb..430b5c1f9517 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -220,7 +220,7 @@ void OColumns::clearColumns()
     disposing();
 }
 
-void SAL_CALL OColumns::disposing()
+void OColumns::disposing()
 {
     MutexGuard aGuard(m_rMutex);
     m_xDrvColumns = nullptr;
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index f797ff9aaa48..499720524008 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -421,7 +421,7 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event )
     renameObject(sOldComposedName,sNewComposedName);
 }
 
-void SAL_CALL OTableContainer::disposing()
+void OTableContainer::disposing()
 {
     OFilteredContainer::disposing();
     // say goodbye to our listeners
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 87d32f989099..6416074e4aea 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -65,10 +65,10 @@ class LocalNameApproval : public IContainerApprove
     ::connectivity::SQLError    m_aErrors;
 
 public:
-    void SAL_CALL   approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement ) override;
+    void approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement ) override;
 };
 
-void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+void LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
 {
     if ( _rName.indexOf( '/' ) != -1 )
         throw IllegalArgumentException(
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index dd90a81a12f4..b07892731f3f 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -68,7 +68,7 @@ namespace dbaccess
         /** tell the container to free all elements and all additional resources.<BR>
             After using this method the object may be reconstructed by calling one of the <code>construct</code> methods.
         */
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
 
         class EnsureReset
         {
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index b9be7f0a2e5a..2fd16937cb5a 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -227,7 +227,7 @@ namespace dbaccess
         void append(const OUString& rName, OColumn*);
         void clearColumns();
         // only the name is identical to ::cppu::OComponentHelper
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
 
     private:
         using OColumns_BASE::setParent;
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 8c81e97da515..47da745bdc89 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -50,7 +50,7 @@ namespace dbaccess
                 if the name or the object are invalid, or not eligible for insertion
                 into the container
         */
-        virtual void SAL_CALL   approveElement(
+        virtual void   approveElement(
             const OUString& _rName,
             const css::uno::Reference< css::uno::XInterface >& _rxElement
         ) = 0;
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index ce2d9b8ac6f2..b99933281168 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -67,7 +67,7 @@ namespace dbaccess
         virtual ~ObjectNameApproval() override;
 
         // IContainerApprove
-        virtual void SAL_CALL approveElement( const OUString& _rName, const css::uno::Reference< css::uno::XInterface >& _rxElement ) override;
+        virtual void approveElement( const OUString& _rName, const css::uno::Reference< css::uno::XInterface >& _rxElement ) override;
 
     };
 
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index 608565109d0f..1148fdb11688 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -64,7 +64,7 @@ namespace dbaccess
         virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
 
-        virtual void SAL_CALL disposing() override;
+        virtual void disposing() override;
 
         virtual void SAL_CALL acquire() throw() override { OFilteredContainer::acquire();}
         virtual void SAL_CALL release() throw() override { OFilteredContainer::release();}
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index d388c1be0dea..930dfca632f8 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -59,7 +59,7 @@ namespace dbaccess
     {
     }
 
-    void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+    void ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
     {
         Reference< XConnection > xConnection( m_pImpl->aConnection );
         if ( !xConnection.is() )