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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/unodatbr.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit aa83592b46e3acc3049fae9460e0df747b8c08ff
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 20 16:24:25 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 22 10:23:07 2021 +0100

    tdf#139298 New created query doesn't show any row
    
    regression from...
    
    commit 5f7cf9ccba25a94c275ec67936dc29f0adb4129a
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Aug 10 19:49:25 2020 +0100
    
        use InterimDBTreeListBox
    
    Change-Id: I755879699aa6fcc9b42b5845ae60406794e11cc2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109738
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index b05ad037377f..2496ec8bc2b6 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1092,14 +1092,14 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
 
         weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
-        if (ppDataSourceEntry)
-        {
-            // (caller wants to have it...)
-            *ppDataSourceEntry = rTreeView.make_iterator(xDataSource.get());
-        }
-
         if (xDataSource)
         {
+            if (ppDataSourceEntry)
+            {
+                // (caller wants to have it...)
+                *ppDataSourceEntry = rTreeView.make_iterator(xDataSource.get());
+            }
+
             // expand if required so
             if (bExpandAncestors)
                 rTreeView.expand_row(*xDataSource);
@@ -1121,14 +1121,14 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
                 }
             }
 
-            if (ppContainerEntry)
-            {
-                // (caller wants to have it...)
-                *ppContainerEntry = rTreeView.make_iterator(xCommandType.get());
-            }
-
             if (xCommandType)
             {
+                if (ppContainerEntry)
+                {
+                    // (caller wants to have it...)
+                    *ppContainerEntry = rTreeView.make_iterator(xCommandType.get());
+                }
+
                 rTreeView.make_unsorted();
 
                 // expand if required so