summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2022-03-14 19:07:12 -0800
committerJim Raykowski <raykowj@gmail.com>2022-05-22 09:17:16 +0200
commit671e755aef9c4019bdca2fbbe5e5e6c704954a32 (patch)
treecc29d4914261b1fb900990420b67fbfbc9d944d3 /vcl
parentbb1d48498c9fdedf8e78344765f6c6eda6f4707c (diff)
tdf#145182 related: fix SwNavigator repositioning on resize
Repositioning on resize began with commit ca8f1ff34e291b74068dace619e58c37ef169f88 which is LOK related. The fix given in this patch checks if LOK is active before executing the lines of code that cause reposition to happen when LOK is not active. Change-Id: I13e7d289dd7ef1d99966d4f5b47a961b868b1b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131570 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dockwin.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f94a04cbb1d8..b799fbe6aad6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -36,6 +36,8 @@
#include "impldockingwrapper.hxx"
+#include <comphelper/lok.hxx>
+
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE)
class DockingWindow::ImplData
@@ -833,7 +835,7 @@ void DockingWindow::setPosSizePixel( tools::Long nX, tools::Long nY,
{
if (!mpFloatWin)
Window::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
- else
+ else if (comphelper::LibreOfficeKit::isActive())
{
mpFloatWin->SetOutputSizePixel(Size(nWidth, nHeight));
mpFloatWin->SetPosPixel(Point(nX, nY));