loplugin:redundantcast: redundant const_cast followed by implicit upcast

Change-Id: I58297ba336d96358eb0683684bbd763870ef56cb

23 files changed, 23 insertions, 23 deletions

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 04ddc3508ac0..3f9dfc9c9629 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -511,7 +511,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, Run
 
 ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
 {
-    return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 void ODatabaseMetaDataResultSet::setProceduresMap()
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 0ea33b25684b..a6ce0a481b4c 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -1135,7 +1135,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) thr
 
 ::cppu::IPropertyArrayHelper & OEvoabResultSet::getInfoHelper()
 {
-    return *const_cast<OEvoabResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 void SAL_CALL OEvoabResultSet::acquire() throw()
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 032ec33ef058..d952d48c557f 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -528,7 +528,7 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
 
 ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
 {
-    return *const_cast< OCommonStatement* >( this )->getArrayHelper();
+    return *getArrayHelper();
 }
 
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 1394f9361047..fd11265acc19 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -798,7 +798,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
-    return *const_cast<OResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a1128455527f..86d882b704b7 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -230,7 +230,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
-    return *const_cast<OStatement_Base*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 OResultSet* OStatement::createResultSet()
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index dd71674f704c..4b1477440007 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -780,7 +780,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper() const
 
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
-    return *const_cast<OResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 void SAL_CALL OResultSet::acquire() throw()
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 6f83c850bad2..9c56020ee84e 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -289,7 +289,7 @@ void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeE
 
 ::cppu::IPropertyArrayHelper & OStatementCommonBase::getInfoHelper()
 {
-    return *const_cast<OStatementCommonBase*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool OStatementCommonBase::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 632a943bc6ea..79b263d0362c 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -106,7 +106,7 @@ void OHSQLTable::construct()
 
 ::cppu::IPropertyArrayHelper & OHSQLTable::getInfoHelper()
 {
-    return *static_cast<OHSQLTable_PROP*>(const_cast<OHSQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0);
+    return *static_cast<OHSQLTable_PROP*>(this)->getArrayHelper(isNew() ? 1 : 0);
 }
 
 sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames)
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index b0a6b1f04e5d..838eaa88768d 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -622,7 +622,7 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLExce
 ::cppu::IPropertyArrayHelper & java_sql_Statement_Base::getInfoHelper()
 
 {
-    return *const_cast<java_sql_Statement_Base*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool java_sql_Statement_Base::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index af3da44eafba..0ad6bb207f3e 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -891,7 +891,7 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s
 
 ::cppu::IPropertyArrayHelper & java_sql_ResultSet::getInfoHelper()
 {
-    return *const_cast<java_sql_ResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool java_sql_ResultSet::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 24241fc1e7c3..2ae8c25eb98b 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -506,7 +506,7 @@ void SAL_CALL KabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeE
 
 ::cppu::IPropertyArrayHelper & KabCommonStatement::getInfoHelper()
 {
-    return *const_cast<KabCommonStatement*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool KabCommonStatement::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index a8692ba9ea86..88d4c2065730 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -105,7 +105,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException
         // allowed
     }
 
-    return const_cast<OCatalog*>(this)->m_pTables;
+    return m_pTables;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 40078e675846..d0c74f604c52 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -614,7 +614,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
-    return *const_cast<OResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool OResultSet::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 12a672588e42..423d6c528a90 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -363,7 +363,7 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
 
 ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
 {
-    return *const_cast<OCommonStatement*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool OCommonStatement::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 8268773903fd..74a8744072d9 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -125,7 +125,7 @@ void OMySQLTable::construct()
 
 ::cppu::IPropertyArrayHelper & OMySQLTable::getInfoHelper()
 {
-    return *static_cast<OMySQLTable_PROP*>(const_cast<OMySQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0);
+    return *static_cast<OMySQLTable_PROP*>(this)->getArrayHelper(isNew() ? 1 : 0);
 }
 
 sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames)
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 25105b06828e..a4d019dfaf72 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -729,7 +729,7 @@ OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, R
 
 ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
 {
-    return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index c3eadb098cc6..426b869c0224 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1434,7 +1434,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
-    return *const_cast<OResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool OResultSet::convertFastPropertyValue(
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index ca6cec3499c6..6ecadf402e87 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -915,7 +915,7 @@ void OStatement_Base::setUsingBookmarks(bool _bUseBookmark)
 
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
-    return *const_cast<OStatement_Base*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool OStatement_Base::convertFastPropertyValue(
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index c71f22e50fc8..1bf65b9e9804 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -86,7 +86,7 @@ void OGroup::disposing(void)
 
 ::cppu::IPropertyArrayHelper & OGroup::getInfoHelper()
 {
-    return *const_cast<OGroup*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 Reference< XNameAccess > SAL_CALL OGroup::getUsers(  ) throw(RuntimeException, std::exception)
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index ccd9e9b53881..59d820659538 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -148,7 +148,7 @@ void SAL_CALL OKey::disposing()
 
 ::cppu::IPropertyArrayHelper & OKey::getInfoHelper()
 {
-    return *const_cast<OKey*>(this)->getArrayHelper(isNew() ? 1 : 0);
+    return *getArrayHelper(isNew() ? 1 : 0);
 }
 
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns(  ) throw(RuntimeException, std::exception)
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index dffe47b8b611..7828c7e1fe12 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -220,7 +220,7 @@ cppu::IPropertyArrayHelper* OTable::createArrayHelper( sal_Int32 /*_nId*/ ) cons
 
 cppu::IPropertyArrayHelper & OTable::getInfoHelper()
 {
-    return *const_cast<OTable*>(this)->getArrayHelper(isNew() ? 1 : 0);
+    return *getArrayHelper(isNew() ? 1 : 0);
 }
 
 Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(RuntimeException, std::exception)
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 393493b67dae..b74842c724eb 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -86,7 +86,7 @@ Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException, std::excep
 
 ::cppu::IPropertyArrayHelper & OUser::getInfoHelper()
 {
-    return *const_cast<OUser*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 // XUser
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index be69eb632cf1..a1c9813b4a33 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -93,7 +93,7 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException,
 
 ::cppu::IPropertyArrayHelper & OView::getInfoHelper()
 {
-    return *const_cast<OView*>(this)->getArrayHelper(isNew() ? 1 : 0);
+    return *getArrayHelper(isNew() ? 1 : 0);
 }
 
 OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException, std::exception)