[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Aug 10 11:18:49 UTC 2020


 dbaccess/source/ui/dlg/adtabdlg.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 09be57965fbdc291a25c4f48550f467b43a7177c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 4 14:19:01 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Aug 10 13:18:17 2020 +0200

    explicit text column to avoid dummy nodes for non-toggle case
    
    Change-Id: If216705929454146d39b291b9a6483c68c3eac89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100061
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 4ad01555d226..35e29ed17f31 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -106,12 +106,12 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const
             if (rTableList.iter_parent(*xCatalog))
             {
                 if (!xAll || !xCatalog->equal(*xAll))
-                    aCatalog = rTableList.get_text(*xCatalog);
+                    aCatalog = rTableList.get_text(*xCatalog, 0);
             }
-            aSchema = rTableList.get_text(*xSchema);
+            aSchema = rTableList.get_text(*xSchema, 0);
         }
     }
-    aTableName = rTableList.get_text(*xEntry);
+    aTableName = rTableList.get_text(*xEntry, 0);
 
     OUString aComposedName;
     try
@@ -318,7 +318,7 @@ OUString QueryListFacade::getSelectedName( OUString& _out_rAliasName ) const
     std::unique_ptr<weld::TreeIter> xEntry(m_rQueryList.make_iterator());
     const bool bEntry = m_rQueryList.get_selected(xEntry.get());
     if (bEntry)
-        sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry);
+        sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry, 0);
     return sSelected;
 }
 


More information about the Libreoffice-commits mailing list