core.git: 2 commits - connectivity/source

[Mike Kaganski (via logerrit)]

 connectivity/source/drivers/firebird/Tables.cxx |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 8705cfecd5a10f817d3a2a02041d85e77282aa30
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 21 02:27:51 2024 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 21 04:09:20 2024 +0200

    Unchecked dereference of UNO_QUERY result
    
    Change-Id: I85599f303e45ea003b5e214206e4ae3e5216509d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170735
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 818f8921931e..d28671464250 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -149,7 +149,7 @@ ObjectType Tables::appendObject(const OUString& rName,
         + " (");
 
     // columns
-    Reference<XColumnsSupplier> xColumnSup(rDescriptor,UNO_QUERY);
+    Reference<XColumnsSupplier> xColumnSup(rDescriptor, UNO_QUERY_THROW);
     Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
     // check if there are columns
     if(!xColumns.is() || !xColumns->getCount())
commit 3bc868b8a4c9d81dc397e2a022e1c8e75982742d
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 21 02:51:53 2024 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 21 04:09:11 2024 +0200

    Optimize a bit
    
    Change-Id: I3ad48edd96dd7d390174626cda6841be04b2db07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170736
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 01d97c1e83ae..818f8921931e 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -166,20 +166,19 @@ ObjectType Tables::appendObject(const OUString& rName,
                 + ",");
         }
     }
-    OUString sSql = aSqlBuffer.makeStringAndClear();
 
     const OUString sKeyStmt = 
::dbtools::createStandardKeyStatement(rDescriptor,xConnection);
     if ( !sKeyStmt.isEmpty() )
-        sSql += sKeyStmt;
+        aSqlBuffer.append(sKeyStmt);
     else
     {
-        if ( sSql.endsWith(",") )
-            sSql = sSql.replaceAt(sSql.getLength()-1, 1, u")");
+        if (aSqlBuffer[aSqlBuffer.getLength() - 1] == ',')
+            aSqlBuffer[aSqlBuffer.getLength() - 1] = ')';
         else
-            sSql += ")";
+            aSqlBuffer.append(")");
     }
 
-    m_xMetaData->getConnection()->createStatement()->execute(sSql);
+    
m_xMetaData->getConnection()->createStatement()->execute(OUString::unacquired(aSqlBuffer));
 
     return createObject(rName);
 }