diff options
| author | Justin Luth <justin.luth@collabora.com> | 2024-11-05 11:05:17 -0500 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2024-11-08 02:14:19 +0100 |
| commit | 27f7770e3e9be60b0caef8469666474151a753fb (patch) | |
| tree | 1ef4001571aa19afdbff53d7ba97a4c18b979da5 /sd | |
| parent | 42533c94ec1a52c49b2587e53ab55e67fc4a449a (diff) | |
tdf#95852 sd: not TopViewShell if mbFormShellAboveParent
This fixes a 5.0 regression from
commit 967a386bccb15b99915a1e878e42450fbe9a2d0e
on Wed Nov 5 20:15:32 2014 +0100
Fix for SUSE L3 bug 624546 (freedesktop 83733)
Change-Id: Id5ec9a853f8abcc329d03434cd6cfcf35195bd2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176086
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 5c733d6a2b02..c2026022139c 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -752,7 +752,7 @@ void ViewShellManager::Implementation::UpdateShellStack() SfxShell* pPreviousTopViewShell = mpTopViewShell; // Update the pointer to the top-most active view shell. - mpTopViewShell = (maActiveViewShells.empty()) + mpTopViewShell = (maActiveViewShells.empty() || mbFormShellAboveParent) ? nullptr : maActiveViewShells.begin()->mpShell; bool bTopViewShellChanged = mpTopViewShell != pPreviousTopViewShell; |