vcl/source/window/floatwin.cxx | 2 +- vcl/source/window/window.cxx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 0ad2815e6f2b458cb2a01f23b513973539990c9a Author: Szymon Kłos <[email protected]> AuthorDate: Thu Mar 3 11:53:49 2022 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Fri Mar 4 12:29:31 2022 +0100 lok: fix position og autofilter in RTL mode Change-Id: I73f2b003185c326f4d66c974a2e5aaecb4e0199a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130916 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mert Tumer <[email protected]> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 2f5bf3e972b3..f33e800a669b 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -514,7 +514,7 @@ tools::Rectangle FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co // compare coordinates in absolute screen coordinates // Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509 - if( pReference->HasMirroredGraphics() ) + if( pReference->HasMirroredGraphics() && !comphelper::LibreOfficeKit::isActive() ) { if(!pReference->IsRTLEnabled() ) pParentWinOutDev->ReMirror(aFloatRect); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index da1b2005b255..c1e3b1a01284 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2708,11 +2708,14 @@ void Window::setPosSizePixel( tools::Long nX, tools::Long nY, { tools::Rectangle aRect( Point ( nX, nY ), Size( nWidth, nHeight ) ); const OutputDevice *pParentOutDev = pParent->GetOutDev(); - pParentOutDev->ReMirror( aRect ); + if (!comphelper::LibreOfficeKit::isActive()) + pParentOutDev->ReMirror( aRect ); nX = aRect.Left(); } } - if( !(nFlags & PosSizeFlags::X) && bHasValidSize && pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth ) + if( !comphelper::LibreOfficeKit::isActive() && + !(nFlags & PosSizeFlags::X) && bHasValidSize && + pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth ) { // RTL: make sure the old right aligned position is not changed // system windows will always grow to the right
