summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-21 09:37:12 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2021-01-22 10:13:43 +0100
commit29574897fa019acb95098ed8ddacbef7737831e3 (patch)
tree6560a5d2dc06a8b04ced5a49c6517ae4cc880f3e
parentd56e4aea5fd5d777204f9f4e4b14cf0047348beb (diff)
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/+/109743 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--basctl/source/basicide/basidesh.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 896b77f2f892..fd0b2127dd11 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;
}
}