loplugin:refcounting in connectivity

Change-Id: Iff2f096e7ee00d9cb29d47462dd7e1963c6b06e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111302
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 56 insertions, 67 deletions

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 24be4d72a6ce..75d0a04dc22a 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -496,128 +496,126 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  )
 
 void ODatabaseMetaDataResultSet::setProceduresMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setProceduresMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setCatalogsMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setCatalogsMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setSchemasMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setSchemasMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setColumnPrivilegesMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setColumnsMap()
 {
-
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setColumnsMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setTablesMap()
 {
-
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTablesMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setPrimaryKeysMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setIndexInfoMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setIndexInfoMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTablePrivilegesMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setCrossReferenceMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setCrossReferenceMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setVersionColumnsMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setVersionColumnsMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setBestRowIdentifierMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setBestRowIdentifierMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setTypeInfoMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTypeInfoMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setUDTsMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setUDTsMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setTableTypes()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setTableTypes();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setExportedKeysMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setExportedKeysMap();
     m_xMetaData = pMetaData;
 }
 
 void ODatabaseMetaDataResultSet::setImportedKeysMap()
 {
-    ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData();
+    rtl::Reference<ODatabaseMetaDataResultSetMetaData> pMetaData = new ODatabaseMetaDataResultSetMetaData();
     pMetaData->setImportedKeysMap();
     m_xMetaData = pMetaData;
 }
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 8671df0b042f..f81eca9f0a90 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -111,7 +111,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= aCatalog;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))  >>= aSchema;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))        >>= aTable;
-        connectivity::sdbcx::OColumn* pRet = new connectivity::sdbcx::OColumn(_rName,
+        rtl::Reference<connectivity::sdbcx::OColumn> pRet = new connectivity::sdbcx::OColumn(_rName,
                                                 pColDesc->aField6,
                                                 pColDesc->sField13,
                                                 pColDesc->sField12,
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index e5823278095e..325d0ff067c8 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -163,10 +163,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  )
             m_aTypeInfoRows = aTypeInfoRows;
         }
     }
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
-    Reference< XResultSet > xRet = pResult;
+    rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
     pResult->setRows(m_aTypeInfoRows);
-    return xRet;
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys(
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index bbb5ca706f20..1db4426c1888 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -82,17 +82,16 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
                 sal_Int32 nNull = xRow->getInt(11);
                 OUString aColumnDef(xRow->getString(13));
 
-                OIndexColumn* pRet = new OIndexColumn(bAsc,
-                                                      _rName,
-                                                      aTypeName,
-                                                      aColumnDef,
-                                                      nNull,
-                                                      nSize,
-                                                      nDec,
-                                                      nDataType,
-                                                      true,
-                                                      aCatalog, aSchema, aTable);
-                xRet = pRet;
+                xRet = new OIndexColumn(bAsc,
+                                        _rName,
+                                        aTypeName,
+                                        aColumnDef,
+                                        nNull,
+                                        nSize,
+                                        nDec,
+                                        nDataType,
+                                        true,
+                                        aCatalog, aSchema, aTable);
                 break;
             }
         }
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 5a8c7c29a0f4..b0998b5b3a79 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -101,10 +101,9 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
                 catch(const Exception&)
                 {
                 }
-                OIndexHelper* pRet = new OIndexHelper(m_pTable,aName,aQualifier,bUnique,
+                xRet = new OIndexHelper(m_pTable,aName,aQualifier,bUnique,
                     bPrimarKeyIndex,
                     nClustered == IndexType::CLUSTERED);
-                xRet = pRet;
                 break;
             }
         }
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index acbfc54bf000..0a2c02bb22bb 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -99,19 +99,18 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
                     // sometimes we get an error when asking for this param
                 }
 
-                OKeyColumn* pRet = new OKeyColumn(aRefColumnName,
-                                                  _rName,
-                                                  aTypeName,
-                                                  sColumnDef,
-                                                  nNull,
-                                                  nSize,
-                                                  nDec,
-                                                  nDataType,
-                                                  isCaseSensitive(),
-                                                  aCatalog,
-                                                  aSchema,
-                                                  aTable);
-                xRet = pRet;
+                xRet = new OKeyColumn(aRefColumnName,
+                                    _rName,
+                                    aTypeName,
+                                    sColumnDef,
+                                    nNull,
+                                    nSize,
+                                    nDec,
+                                    nDataType,
+                                    isCaseSensitive(),
+                                    aCatalog,
+                                    aSchema,
+                                    aTable);
             }
         }
     }
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 4c223624dc3d..ab16752677b5 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -57,14 +57,12 @@ sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
 
     if(!_rName.isEmpty())
     {
-        OTableKeyHelper* pRet = new OTableKeyHelper(m_pTable,_rName,m_pTable->getKeyProperties(_rName));
-        xRet = pRet;
+        xRet = new OTableKeyHelper(m_pTable,_rName,m_pTable->getKeyProperties(_rName));
     }
 
     if(!xRet.is()) // we have a primary key with a system name
     {
-        OTableKeyHelper* pRet = new OTableKeyHelper(m_pTable,_rName,m_pTable->getKeyProperties(_rName));
-        xRet = pRet;
+        xRet = new OTableKeyHelper(m_pTable,_rName,m_pTable->getKeyProperties(_rName));
     }
 
     return xRet;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 31e54c1b0606..fef22a3b2196 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1713,21 +1713,20 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
     }
     // build an interaction request
     // two continuations (Ok and Cancel)
-    OInteractionAbort* pAbort = new OInteractionAbort;
-    OParameterContinuation* pParams = new OParameterContinuation;
+    rtl::Reference<OInteractionAbort> pAbort = new OInteractionAbort;
+    rtl::Reference<OParameterContinuation> pParams = new OParameterContinuation;
     // the request
     ParametersRequest aRequest;
     Reference<XIndexAccess> xWrappedParameters = new OParameterWrapper(aNewParameterSet,xParamsAsIndicies);
     aRequest.Parameters = xWrappedParameters;
     aRequest.Connection = _xConnection;
-    OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aRequest));
-    Reference< XInteractionRequest > xRequest(pRequest);
+    rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest(makeAny(aRequest));
     // some knittings
     pRequest->addContinuation(pAbort);
     pRequest->addContinuation(pParams);
 
     // execute the request
-    _rxHandler->handle(xRequest);
+    _rxHandler->handle(pRequest);
 
     if (!pParams->wasSelected())
     {
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ecc2f4f8f221..907bc7fd3698 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -484,7 +484,7 @@ namespace
                         }
                     }
 
-                    connectivity::sdbcx::OColumn* pRet = new connectivity::sdbcx::OColumn(_rName,
+                    xProp = new connectivity::sdbcx::OColumn(_rName,
                                                 aField6,
                                                 sField13,
                                                 sField12,
@@ -500,7 +500,6 @@ namespace
                                                 _aSchema,
                                                 _aTable);
 
-                    xProp = pRet;
                     break;
                 }
             }
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 906dbc0d3f27..a0b0b57958fc 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -643,15 +643,14 @@ namespace dbtools
         OSL_ENSURE ( _rxCompletionHandler.is(), "ParameterManager::completeParameters: invalid interaction handler!" );
 
         // two continuations (Ok and Cancel)
-        OInteractionAbort* pAbort = new OInteractionAbort;
-        OParameterContinuation* pParams = new OParameterContinuation;
+        rtl::Reference<OInteractionAbort> pAbort = new OInteractionAbort;
+        rtl::Reference<OParameterContinuation> pParams = new OParameterContinuation;
 
         // the request
         ParametersRequest aRequest;
         aRequest.Parameters = m_pOuterParameters.get();
         aRequest.Connection = _rxConnection;
-        OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aRequest ) );
-        Reference< XInteractionRequest > xRequest( pRequest );
+        rtl::Reference<OInteractionRequest> pRequest = new OInteractionRequest( makeAny( aRequest ) );
 
         // some knittings
         pRequest->addContinuation( pAbort );
@@ -660,7 +659,7 @@ namespace dbtools
         // execute the request
         try
         {
-            _rxCompletionHandler->handle( xRequest );
+            _rxCompletionHandler->handle( pRequest );
         }
         catch( const Exception& )
         {
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index f34ad6228532..37a0d6862c62 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -308,7 +308,7 @@ namespace dbtools
         }
 
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
-        parse::OParseColumn* pColumn = new parse::OParseColumn( sField,
+        rtl::Reference<parse::OParseColumn> pColumn = new parse::OParseColumn( sField,
                                                                 OUString(),
                                                                 OUString(),
                                                                 OUString(),