loplugin:refcounting (clang-cl)

Change-Id: I91189ebd902b70e2fbe42fe8cc09b8677af1a5fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112194
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

8 files changed, 62 insertions, 98 deletions

diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 0ade4a071c45..010807610868 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#include <rtl/ref.hxx>
 #include <algorithm>
 #include <string_view>
 #include <strings.hrc>
@@ -61,9 +62,9 @@ Reference< XPropertySet > OColumns::createDescriptor()
 // XAppend
 sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
-    OAdoColumn* pColumn = getUnoTunnelImplementation<OAdoColumn>( descriptor );
+    rtl::Reference<OAdoColumn> pColumn = getUnoTunnelImplementation<OAdoColumn>( descriptor );
     Reference< XPropertySet > xColumn;
-    if ( pColumn == nullptr )
+    if ( !pColumn.is() )
     {
         // m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
         pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection);
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 6a26265c4d42..664990f66564 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -163,10 +163,9 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  )
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-    OStatement* pStmt = new OStatement(this);
-    Reference< XStatement > xStmt = pStmt;
-    m_aStatements.push_back(WeakReferenceHelper(*pStmt));
-    return pStmt;
+    Reference< XStatement > xStmt = new OStatement(this);
+    m_aStatements.push_back(WeakReferenceHelper(xStmt));
+    return xStmt;
 }
 
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql )
@@ -175,9 +174,8 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    OPreparedStatement* pStmt = new OPreparedStatement(this, sql);
-    Reference< XPreparedStatement > xPStmt = pStmt;
-    m_aStatements.push_back(WeakReferenceHelper(*pStmt));
+    Reference< XPreparedStatement > xPStmt = new OPreparedStatement(this, sql);
+    m_aStatements.push_back(WeakReferenceHelper(xPStmt));
     return xPStmt;
 }
 
@@ -187,9 +185,8 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    OCallableStatement* pStmt = new OCallableStatement(this, sql);
-    Reference< XPreparedStatement > xPStmt = pStmt;
-    m_aStatements.push_back(WeakReferenceHelper(*pStmt));
+    Reference< XPreparedStatement > xPStmt = new OCallableStatement(this, sql);
+    m_aStatements.push_back(WeakReferenceHelper(xPStmt));
     return xPStmt;
 }
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 8e46761e8c27..a60afbd6f131 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -28,6 +28,7 @@
 #include <FDatabaseMetaDataResultSet.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#include <rtl/ref.hxx>
 
 using namespace ::comphelper;
 
@@ -86,10 +87,9 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     ADORecordset *pRecordset = m_pADOConnection->getTypeInfo();
 
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setTypeInfoMap(ADOS::isJetEngine(m_pConnection->getEngineType()));
-    Reference< XResultSet > xRef = pResult;
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  )
@@ -101,13 +101,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  )
     m_pADOConnection->OpenSchema(adSchemaCatalogs,vtEmpty,vtEmpty,&pRecordset);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setCatalogsMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
@@ -124,12 +121,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  )
     m_pADOConnection->OpenSchema(adSchemaSchemata,vtEmpty,vtEmpty,&pRecordset);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setSchemasMap();
-    xRef = pResult;
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
@@ -139,12 +133,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setColumnPrivilegesMap();
-    xRef = pResult;
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
@@ -154,13 +145,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setColumnsMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
@@ -170,13 +158,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setTablesMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
@@ -186,13 +171,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setProcedureColumnsMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
@@ -203,13 +185,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setProceduresMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
@@ -278,12 +257,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setCrossReferenceMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
@@ -292,13 +269,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setCrossReferenceMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
@@ -307,13 +281,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setPrimaryKeysMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
@@ -323,13 +294,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setIndexInfoMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
@@ -343,13 +311,13 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         ADORecordset *pRecordset = m_pADOConnection->getTablePrivileges(catalog,schemaPattern,tableNamePattern);
         ADOS::ThrowException(*m_pADOConnection,*this);
 
-        ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+        rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
         pResult->setTablePrivilegesMap();
         xRef = pResult;
     }
     else
     {
-        ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTablePrivileges);
+        rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTablePrivileges);
         xRef = pResult;
         ::connectivity::ODatabaseMetaDataResultSet::ORows aRows;
         ::connectivity::ODatabaseMetaDataResultSet::ORow aRow(8);
@@ -393,13 +361,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable);
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    Reference< XResultSet > xRef;
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset);
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(pRecordset);
     pResult->setCrossReferenceMap();
-    xRef = pResult;
 
-    return xRef;
+    return pResult;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index a12f6e1fd6c4..caa4dd800324 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/seqstream.hxx>
 #include <connectivity/dbexception.hxx>
-
+#include <rtl/ref.hxx>
 
 #include <oledb.h>
 
@@ -795,7 +795,7 @@ void ODatabaseMetaDataResultSet::setProceduresMap()
     aMap[DB_PT_FUNCTION]    = ProcedureResult::RETURN;
     m_aValueRange[4] = aMap;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setProceduresMap();
     m_xMetaData = pMetaData;
 }
@@ -825,7 +825,7 @@ void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
     m_aColMapping.push_back(9);
     m_aColMapping.push_back(10);
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setColumnPrivilegesMap();
     m_xMetaData = pMetaData;
 }
@@ -902,7 +902,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
     aMap2[1] = "NO";
     m_aIntValueRange[18] = aMap2;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setColumnsMap();
     m_xMetaData = pMetaData;
 }
@@ -914,7 +914,7 @@ void ODatabaseMetaDataResultSet::setTablesMap()
         m_aColMapping.push_back(i);
     m_aColMapping.push_back(6);
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setTablesMap();
     m_xMetaData = pMetaData;
 }
@@ -981,7 +981,7 @@ void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
 
     m_aValueRange[10] = aMap;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
@@ -995,7 +995,7 @@ void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
     m_aColMapping.push_back(7);
     m_aColMapping.push_back(8);
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
@@ -1037,7 +1037,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
 
     m_aIntValueRange[21] = aMap3;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setIndexInfoMap();
     m_xMetaData = pMetaData;
 }
@@ -1059,7 +1059,7 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
     m_aIntValueRange[7] = aMap;
 
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setTablePrivilegesMap();
     m_xMetaData = pMetaData;
 }
@@ -1090,7 +1090,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
     m_aStrValueRange[14] = aMap;
     m_aStrValueRange[15] = aMap;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setCrossReferenceMap();
     m_xMetaData = pMetaData;
 }
@@ -1168,7 +1168,7 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine)
     ::std::map<sal_Int32,sal_Int32> aCurrencyMapping;
     m_aValueRange[11] = aCurrencyMapping;
 
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
     pMetaData->setTypeInfoMap();
     m_xMetaData = pMetaData;
 }
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 610f7722c697..fcda87a9c0ab 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -191,10 +191,10 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co
         if(aCatalog.IsValid())
         {
             aCatalog.putref_ActiveConnection(*pConnection->getConnection());
-            OCatalog* pCatalog = new OCatalog(aCatalog,pConnection);
+            rtl::Reference<OCatalog> pCatalog = new OCatalog(aCatalog,pConnection);
             xTab = pCatalog;
             pConnection->setCatalog(xTab);
-            pConnection->setCatalog(pCatalog);
+            pConnection->setCatalog(pCatalog.get());
         }
     }
     return xTab;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 34697fa4388a..c06b1267b57b 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
+#include <rtl/ref.hxx>
 #include <strings.hrc>
 
 #include <limits>
@@ -264,13 +265,12 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  )
     CHECK_RETURN(m_RecordSet.get_CursorType(m_eCursorType))
     CHECK_RETURN(m_RecordSet.get_LockType(m_eLockType))
 
-    OResultSet* pSet = new OResultSet(m_RecordSet,this);
-    Reference< XResultSet > xRs = pSet;
+    rtl::Reference<OResultSet> pSet = new OResultSet(m_RecordSet,this);
     pSet->construct();
     pSet->setMetaData(getMetaData());
-    m_xResultSet = WeakReference<XResultSet>(xRs);
+    m_xResultSet = WeakReference<XResultSet>(pSet);
 
-    return xRs;
+    return pSet;
 }
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 599df13aba36..553d42a976f3 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
+#include <rtl/ref.hxx>
 
 #undef max
 
@@ -305,13 +306,12 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
     CHECK_RETURN(aSet.get_CursorType(m_eCursorType))
     CHECK_RETURN(aSet.get_LockType(m_eLockType))
 
-    OResultSet* pSet = new OResultSet(aSet,this);
-    Reference< XResultSet > xRs = pSet;
+    rtl::Reference<OResultSet> pSet = new OResultSet(aSet,this);
     pSet->construct();
 
-    m_xResultSet = WeakReference<XResultSet>(xRs);
+    m_xResultSet = WeakReference<XResultSet>(pSet);
 
-    return xRs;
+    return pSet;
 }
 
 
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index 77cc5abfae0f..cbe239e73825 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#include <rtl/ref.hxx>
 #include <strings.hrc>
 
 using namespace ::comphelper;
@@ -41,7 +42,7 @@ using namespace com::sun::star::container;
 
 sdbcx::ObjectType OViews::createObject(const OUString& _rName)
 {
-    OAdoView* pView = new OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName));
+    rtl::Reference<OAdoView> pView = new OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName));
     pView->setNew(false);
     return pView;
 }