[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - connectivity/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 7 14:45:17 UTC 2020


 connectivity/source/drivers/firebird/Catalog.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee5a599516e4c9480b5dbd0a471baa237c74b53d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Mar 6 18:15:18 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Mar 7 15:44:45 2020 +0100

    tdf#131164: Fix crash on Tools>User Administration (Firebird)
    
    see https://bugs.documentfoundation.org/show_bug.cgi?id=131164#c8
    
    Change-Id: If55a7b015e4e14575c3933a98c70ed4aaf4d7c73
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90123
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit dada19a89cbdc5f089fe1200275a1688a1ff1967)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90032
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/firebird/Catalog.cxx b/connectivity/source/drivers/firebird/Catalog.cxx
index 7dc3593d577a..6207625296f6 100644
--- a/connectivity/source/drivers/firebird/Catalog.cxx
+++ b/connectivity/source/drivers/firebird/Catalog.cxx
@@ -71,8 +71,8 @@ void Catalog::refreshUsers()
 {
     OUString const sSql("SELECT DISTINCT RDB$USER FROM RDB$USER_PRIVILEGES");
 
-    uno::Reference< XResultSet > xUsers = m_xMetaData->getConnection()
-                                            ->createStatement()->executeQuery(sSql);
+    Reference<XStatement> xStmt= m_xMetaData->getConnection()->createStatement();
+    uno::Reference< XResultSet > xUsers = xStmt->executeQuery(sSql);
 
     if (!xUsers.is())
         return;


More information about the Libreoffice-commits mailing list