Use getXWeak in connectivity

Change-Id: Id301a9321f77e5ccc1269a3b677e9faeb19a4011
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150841
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

10 files changed, 11 insertions, 14 deletions

diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index cdb5069cb322..5504c4e14253 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -78,7 +78,7 @@ namespace dbtools
     void OAutoConnectionDisposer::stopPropertyListening( const Reference< XPropertySet >& _rxEventSource )
     {
         // prevent deletion of ourself while we're herein
-        Reference< XInterface > xKeepAlive(static_cast< XWeak* >(this));
+        Reference< XInterface > xKeepAlive(getXWeak());
 
         try
         {   // remove ourself as property change listener
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 811f103bc9a6..9a1bdf971f97 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -48,7 +48,7 @@ namespace connectivity
             OSL_ENSURE(m_xDriver.is(), "ODriverWrapper::ODriverWrapper: invalid aggregate (no XDriver)!");
 
             // set ourself as delegator
-            m_xDriverAggregate->setDelegator( static_cast< XWeak* >( this ) );
+            m_xDriverAggregate->setDelegator( getXWeak() );
         }
         osl_atomic_decrement( &m_refCount );
     }
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index b7b11cc29176..eccf97751c8f 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -53,7 +53,7 @@ connectivity_calc_ODriver(
     }
     if (ret)
         ret->acquire();
-    return static_cast<cppu::OWeakObject*>(ret.get());
+    return getXWeak(ret.get());
 }
 
 
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 8eae0013c940..ff0ec256e18a 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -51,7 +51,7 @@ connectivity_dbase_ODriver(
     }
     if (ret)
         ret->acquire();
-    return static_cast<cppu::OWeakObject*>(ret.get());
+    return getXWeak(ret.get());
 }
 
 
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 2505cbf3dc81..043be2553f86 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -912,7 +912,7 @@ Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-    return static_cast<cppu::OWeakObject*>(m_pStatement);
+    return cppu::getXWeak(m_pStatement);
 }
 
 
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 29492895510e..51e357611558 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -54,7 +54,7 @@ connectivity_flat_ODriver(
     }
     if (ret)
         ret->acquire();
-    return static_cast<cppu::OWeakObject*>(ret.get());
+    return getXWeak(ret.get());
 }
 
 Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index f4b7eb837c0d..1d5326ca6302 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -380,7 +380,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings(  )
         java_sql_SQLWarning_BASE        warn_base( t.pEnv, out );
         return Any(
             static_cast< css::sdbc::SQLException >(
-                java_sql_SQLWarning(warn_base,*static_cast<cppu::OWeakObject*>(this))));
+                java_sql_SQLWarning(warn_base,getXWeak())));
     }
 
     return Any();
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 90d0e3d8746a..b2c7d31842c4 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -183,7 +183,7 @@ OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* p
     : OPreparedResultSet_BASE(m_aMutex)
     , OPropertySetHelper(OPreparedResultSet_BASE::rBHelper)
     , m_rConnection(rConn)
-    , m_aStatement(css::uno::Reference<css::uno::XWeak>(static_cast<OWeakObject*>(pStmt)))
+    , m_aStatement(css::uno::Reference(cppu::getXWeak(pStmt)))
     , m_pStmt(pMyStmt)
     , m_encoding(rConn.getConnectionEncoding())
     , m_nColumnCount(mysql_stmt_field_count(pMyStmt))
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 6d7b6d4d9a77..5fc0fc9a7d46 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -108,7 +108,7 @@ OResultSet::OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* p
     : OResultSet_BASE(m_aMutex)
     , OPropertySetHelper(OResultSet_BASE::rBHelper)
     , m_pMysql(rConn.getMysqlConnection())
-    , m_aStatement(css::uno::Reference<css::uno::XWeak>(static_cast<OWeakObject*>(pStmt)))
+    , m_aStatement(css::uno::Reference(cppu::getXWeak(pStmt)))
     , m_pResult(pResult)
     , m_encoding(_encoding)
 {
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index fa3a3dcf685a..21325d73f6b6 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -38,17 +38,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 connectivity_writer_ODriver(css::uno::XComponentContext* context,
                             css::uno::Sequence<css::uno::Any> const& /*rArguments*/)
 {
-    rtl::Reference<ODriver> ret;
     try
     {
-        ret = new ODriver(context);
+        return acquire(new ODriver(context));
     }
     catch (...)
     {
     }
-    if (ret)
-        ret->acquire();
-    return static_cast<cppu::OWeakObject*>(ret.get());
+    return nullptr;
 }
 
 uno::Reference<sdbc::XConnection>