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>

15 files changed, 18 insertions, 18 deletions

diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 8185b34ce2eb..25e45cd94946 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -245,7 +245,7 @@ namespace param
     }
 
 
-    void SAL_CALL ParameterWrapper::dispose()
+    void ParameterWrapper::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 2e7d6244c052..50d706e55f18 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -74,7 +74,7 @@ namespace dbtools
     }
 
 
-    Any SAL_CALL WarningsContainer::getWarnings(  ) const
+    Any WarningsContainer::getWarnings(  ) const
     {
         Any aAllWarnings;
         if ( m_xExternalWarnings.is() )
@@ -87,7 +87,7 @@ namespace dbtools
     }
 
 
-    void SAL_CALL WarningsContainer::clearWarnings(  )
+    void WarningsContainer::clearWarnings(  )
     {
         if ( m_xExternalWarnings.is() )
             m_xExternalWarnings->clearWarnings();
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index cfa16ca44e2a..d6d1c8f3ee13 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -151,7 +151,7 @@ m_xDriverNode.clear();
 m_xDriver.clear();
 }
 
-Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
+Reference< XConnection > OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
 {
     MutexGuard aGuard(m_aMutex);
 
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index b23db6005fa4..a678dd352de9 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -139,7 +139,7 @@ namespace connectivity
         void clear(bool _bDispose);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
+        css::uno::Reference< css::sdbc::XConnection > getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
         // XPropertyChangeListener
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3629bfebdb5d..8361e29c8faa 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2317,7 +2317,7 @@ namespace
     }
 }
 
-void SAL_CALL ODbaseTable::renameImpl( const OUString& newName )
+void ODbaseTable::renameImpl( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index abb0c03b8be0..7a515d46a536 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -278,7 +278,7 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
     }
 }
 
-void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
+void OResultSet::checkColumnIndex(sal_Int32 nIndex)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -292,7 +292,7 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
     }
 }
 
-void SAL_CALL OResultSet::checkRowIndex()
+void OResultSet::checkRowIndex()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index 75b0d6fcd60d..a7142451c54b 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -115,10 +115,10 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL checkColumnIndex( sal_Int32 index );
+            void checkColumnIndex( sal_Int32 index );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL checkRowIndex();
+            void checkRowIndex();
 
             // you can't delete objects of this type
             virtual ~OResultSet() override;
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 3f861f6045a3..95718217d445 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -353,7 +353,7 @@ void OConnection::disposing()
     m_xCatalog.clear();
 }
 
-Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
+Reference< XTablesSupplier > OConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XTablesSupplier > xTab = m_xCatalog;
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index f83f265f5780..3c2b2f179b10 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -92,7 +92,7 @@ namespace connectivity
 
             // Added to enable me to use SQLInterpreter which requires an
             // XNameAccess i/f to access tables.
-            css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
+            css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog();
 
             void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext );
             void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 585d0bc61d9a..09d3c0d229c4 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -49,7 +49,7 @@ ODatabaseMetaData::~ODatabaseMetaData()
 }
 
 
-ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
+ODatabaseMetaDataResultSet::ORows& ODatabaseMetaData::getColumnRows(
         const OUString& tableNamePattern,
         const OUString& columnNamePattern )
 {
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index cda03805e0b1..edad3a74aeaf 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -29,7 +29,7 @@ namespace connectivity
                                        m_pMetaDataHelper;
 
             /// @throws css::sdbc::SQLException
-            ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern );
+            ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern );
 
         protected:
             virtual ~ODatabaseMetaData() override;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 1312926f6d1d..9234bdc39a36 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1037,7 +1037,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
     return 0;
 }
 
-void SAL_CALL OResultSet::executeQuery()
+void OResultSet::executeQuery()
 {
     ResultSetEntryGuard aGuard( *this );
 
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 5c040c9aabeb..da287247c653 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -279,7 +279,7 @@ public:
             // MozAddressbook Specific methods
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL executeQuery();
+            void executeQuery();
 
             void setTable(OTable* _rTable);
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 9918180a473f..a9f447739a4b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -78,7 +78,7 @@ namespace connectivity
             /// @throws css::uno::RuntimeException
             OUString getDefaultProfile( css::mozilla::MozillaProductType product );
             /// @throws css::uno::RuntimeException
-            bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
+            bool getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
         private:
             ProductStruct m_ProductProfileList[4];
             void      LoadProductsInfo();
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 9fa3499a1218..962a66a48f63 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -133,7 +133,7 @@ namespace connectivity
             /// @throws css::sdbc::SQLException
             /// @throws css::container::ElementExistException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL renameImpl( const OUString& newName );
+            void renameImpl( const OUString& newName );
             void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName);
 
         protected: