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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/basidesh.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 1c003228bdb3353539fea812eebf60cda9e5aec8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 21 09:37:12 2021 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jan 22 10:13:21 2021 +0100

    Resolves: tdf#133345 Macros Editor IDE: no dialogbox tabs
    
    Revert "property browser appearing as a blank area when changing modules"
    
    This reverts commit a07f0a57378a8901d647e3e5de8347445a82ea17.
    
    I no longer see a stray property browser area with this reverted anyway.
    
    Change-Id: Icbf7c59f582172a9baef9e512c7ddbf7fba0ff85
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109742
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 3cf2ed621457..502084b0bbfc 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -698,15 +698,14 @@ void Shell::UpdateWindows()
                             for ( sal_Int32 j = 0 ; j < nDlgCount ; j++ )
                             {
                                 OUString aDlgName = pDlgNames[ j ];
+                                // this find only looks for non-suspended windows;
+                                // suspended windows are handled in CreateDlgWin
+                                VclPtr<DialogWindow> pWin = FindDlgWin( doc, aLibName, aDlgName );
+                                if ( !pWin )
+                                    pWin = CreateDlgWin( doc, aLibName, aDlgName );
                                 if ( !pNextActiveWindow && pLibInfoItem && pLibInfoItem->GetCurrentName() == aDlgName &&
                                      pLibInfoItem->GetCurrentType() == TYPE_DIALOG )
                                 {
-                                    // this find only looks for non-suspended windows;
-                                    // suspended windows are handled in CreateDlgWin
-                                    VclPtr<DialogWindow> pWin = FindDlgWin( doc, aLibName, aDlgName );
-                                    if ( !pWin )
-                                        pWin = CreateDlgWin( doc, aLibName, aDlgName );
-
                                     pNextActiveWindow = pWin;
                                 }
                             }