[Libreoffice-commits] core.git: sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/view/gridwin2.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f7b439f5d510a021f5c7cce965d9fb09f9929a44
Author:     Dennis Francis <dennis.fran...@collabora.com>
AuthorDate: Wed Nov 24 16:59:47 2021 +0530
Commit:     Dennis Francis <dennis.fran...@collabora.com>
CommitDate: Mon Jan 31 06:52:02 2022 +0100

    lokCalcRTL: fix autofilter button hit detection
    
    No mirroring needed when not in tile painting mode. All positions are
    in document coordinates.
    
    Conflicts:
            sc/source/ui/view/gridwin2.cxx
    
    Change-Id: I45425e2ddce7f5ddc5086dcdce31bb6d081edc41
    (cherry picked from commit 2eb5f597c3b1c5a680d6e0f9d0719f9f6977e1a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128903
    Tested-by: Jenkins
    Reviewed-by: Dennis Francis <dennis.fran...@collabora.com>

diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index a7cd96a649ba..7071bd384f4b 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -109,8 +109,9 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW 
nRow, const MouseEvent&
     Point aDiffPix = rMEvt.GetPosPixel();
 
     aDiffPix -= aScrPos;
+    bool bLOKActive = comphelper::LibreOfficeKit::isActive();
     bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
-    if ( bLayoutRTL )
+    if ( bLayoutRTL && !bLOKActive )
         aDiffPix.setX( -aDiffPix.X() );
 
     tools::Long nSizeX, nSizeY;
@@ -121,8 +122,8 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW 
nRow, const MouseEvent&
 
     // Check if the mouse cursor is clicking on the popup arrow box.
     mpFilterButton.reset(new ScDPFieldButton(GetOutDev(), 
&GetSettings().GetStyleSettings(), &mrViewData.GetZoomY(), &rDoc));
-    mpFilterButton->setBoundingBox(aScrPos, aScrSize, bLayoutRTL);
-    mpFilterButton->setPopupLeft(bLayoutRTL);   // #i114944# AutoFilter button 
is left-aligned in RTL
+    mpFilterButton->setBoundingBox(aScrPos, aScrSize, bLayoutRTL && 
!bLOKActive);
+    mpFilterButton->setPopupLeft(bLayoutRTL && bLOKActive ? false : 
bLayoutRTL);   // #i114944# AutoFilter button is left-aligned in RTL
     Point aPopupPos;
     Size aPopupSize;
     mpFilterButton->getPopupBoundingBox(aPopupPos, aPopupSize);