1 files changed, 23 insertions, 26 deletions

diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 540e333aa639..b0b04fc08f21 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -30,7 +30,9 @@
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
+#include <rtl/ref.hxx>
 
 #include <vector>
 
@@ -729,15 +731,14 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates(  )
 
 Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  )
 {
-    return m_xConnection.get();
+    return m_xConnection;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  )
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
-    Reference< XResultSet > xRef = pResult;
+    rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
 
-    static ODatabaseMetaDataResultSet::ORows aRows = [&]
+    static ODatabaseMetaDataResultSet::ORows aRows = []
     {
         static constexpr OUStringLiteral aTable = u"TABLE";
         ODatabaseMetaDataResultSet::ORows tmp;
@@ -747,16 +748,15 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  )
         tmp.push_back(aRow);
         return tmp;
     }();
-    pResult->setRows(aRows);
-    return xRef;
+    pResult->setRows(std::vector(aRows));
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  )
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
-    Reference< XResultSet > xRef = pResult;
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
 
-    static ODatabaseMetaDataResultSet::ORows aRows = [&]()
+    static ODatabaseMetaDataResultSet::ORows aRows = []()
     {
         ODatabaseMetaDataResultSet::ORows tmp;
         ODatabaseMetaDataResultSet::ORow aRow(19);
@@ -805,8 +805,8 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  )
 
         return tmp;
     }();
-    pResult->setRows(aRows);
-    return xRef;
+    pResult->setRows(std::vector(aRows));
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs(  )
@@ -832,8 +832,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
     const OUString& tableNamePattern,
     const OUString& columnNamePattern)
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
-    Reference< XResultSet > xRef = pResult;
+    rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
     MacabRecords *aRecords;
     OUString sTableName;
 
@@ -909,8 +908,8 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
             }
         }
     }
-    pResult->setRows(aRows);
-    return xRef;
+    pResult->setRows(std::move(aRows));
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
@@ -919,13 +918,12 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     const OUString&,
     const Sequence< OUString >& types)
 {
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
-    Reference< XResultSet > xRef = pResult;
+    rtl::Reference<ODatabaseMetaDataResultSet> pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
 
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
-    static constexpr OUStringLiteral aTable = u"TABLE";
+    static constexpr OUString aTable = u"TABLE"_ustr;
     bool bTableFound = false;
     const OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
@@ -944,7 +942,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
         p++;
     }
     if (!bTableFound)
-        return xRef;
+        return pResult;
 
     static ODatabaseMetaDataResultSet::ORows aRows = [&]()
     {
@@ -960,7 +958,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
         aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[2] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[3] = new ORowSetValueDecorator(xRecords->getName());
-        aRow[4] = new ORowSetValueDecorator(OUString(aTable));
+        aRow[4] = new ORowSetValueDecorator(aTable);
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
         tmp.push_back(aRow);
 
@@ -971,8 +969,8 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
         }
         return tmp;
     }();
-    pResult->setRows(aRows);
-    return xRef;
+    pResult->setRows(std::vector(aRows));
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns(
@@ -992,8 +990,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures(
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
     const Any&, const OUString&, const OUString& table )
 {
-    ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
-    Reference< XResultSet > xRef = pResult;
+    rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
 
     ODatabaseMetaDataResultSet::ORows aRows;
 
@@ -1016,8 +1013,8 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
 
         aRows.push_back(aRow);
     }
-    pResult->setRows(aRows);
-    return xRef;
+    pResult->setRows(std::move(aRows));
+    return pResult;
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys(