[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/uitest/uiobject.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 43f17336db888bd5d4671325e679dc12e693b1d0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 9 15:53:35 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 9 21:00:07 2021 +0200

    split out duplicated condition and test it once
    
    Change-Id: I6b64ffc85123600046355cd5c4c8830f0d8e44c5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118695
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 14ff3f5d7690..fe9791c83aba 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -411,16 +411,16 @@ vcl::Window* findChild(vcl::Window* pParent, const OUString& rID, bool bRequireV
     for (size_t i = 0; i < nCount; ++i)
     {
         vcl::Window* pChild = pParent->GetChild(i);
-        if (pChild->get_id() == rID
-            && (!bRequireVisible || pChild->IsVisible()))
+        bool bCandidate = !bRequireVisible || pChild->IsVisible();
+        if (!bCandidate)
+            continue;
+
+        if (pChild->get_id() == rID)
             return pChild;
 
-        if (!bRequireVisible || pChild->IsVisible())
-        {
-            vcl::Window* pResult = findChild(pChild, rID);
-            if (pResult)
-                return pResult;
-        }
+        vcl::Window* pResult = findChild(pChild, rID);
+        if (pResult)
+            return pResult;
     }
 
     return nullptr;