From 7357210723e4bd90ca9b2c554d5667eb0085c19e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 21 Jan 2021 09:37:12 +0000 Subject: Resolves: tdf#133345 Macros Editor IDE: no dialogbox tabs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/+/109752 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- basctl/source/basicide/basidesh.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 28fea6e3dcc1..a42722ca9816 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 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 pWin = FindDlgWin( doc, aLibName, aDlgName ); - if ( !pWin ) - pWin = CreateDlgWin( doc, aLibName, aDlgName ); - pNextActiveWindow = pWin; } } -- cgit