[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source

[Szymon Kłos (via logerrit)]

 vcl/source/window/floatwin.cxx |    2 +-
 vcl/source/window/window.cxx   |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5866932788c5b8c6b9573a3ee1c32ba225357df6
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Mar 3 11:53:49 2022 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Mar 16 08:52:00 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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mert Tumer <mert.tu...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131124
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 80ab426aa98d..094a3ef184a2 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -509,7 +509,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( pParentWinOutDev->HasMirroredGraphics()  )
+    if( pParentWinOutDev->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 152d163f3399..453bf8e2ca14 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2712,11 +2712,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