vcl/source/window/dockwin.cxx | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 3867ff745d92d9ad5455647af799b4dd96eec1fb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jun 19 12:49:07 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 20 08:37:48 2024 +0200
tdf#159835 Deduplicate a few lines in DockingWindow::SetFloatingMode
They're the same for both branches.
Change-Id: I73c3433fe3cfbb3eaa1b25cc2a76613d59d894a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169194
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Tested-by: Jenkins
(cherry picked from commit d7aeaeafc32f78ca38942868f965bae0e6c376b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169139
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index e55cca238349..ed31cc356f44 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -758,11 +758,6 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
pWin->SetMinOutputSizePixel( maMinOutSize );
pWin->SetMaxOutputSizePixel( mpImplData->maMaxOutSize );
-
- ToggleFloatingMode();
-
- if ( bVisible )
- Show();
}
else
{
@@ -788,12 +783,12 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
mpWindowImpl->mpRealParent = pRealParent;
mpFloatWin.disposeAndClear();
SetPosPixel( maDockPos );
+ }
- ToggleFloatingMode();
+ ToggleFloatingMode();
- if ( bVisible )
- Show();
- }
+ if (bVisible)
+ Show();
}
void DockingWindow::SetFloatStyle( WinBits nStyle )
