[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source

[Tamás Zolnai]

 sc/source/ui/view/gridwin4.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9f8a05069770d7293d7491a426fca9c4342aa63b
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat May 27 22:15:52 2017 +0200

    tdf#107389: Wrong positioning of AutoFilter buttons in tiledrendering mode
    
    Must be a regression from this commit:
    9113f17e65b1dafbc178fd269e2967c1e2632f0e
    
    Where the offset's and origin's meaning were changed, but
    not all code path was updated accordingly.
    
    Change-Id: Ib519303d5ca5ac7f13e74944e8147ea3220d7684
    Reviewed-on: https://gerrit.libreoffice.org/38102
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit ba5a9132375bcfedebd7c3d2500006161800da3b)
    Reviewed-on: https://gerrit.libreoffice.org/38107
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7b948bcd9bb1..b4b2a910d4a1 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -763,7 +763,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
     {
         // Tiled offset nScrX, nScrY
         MapMode aMap( MapUnit::MapPixel );
-        aMap.SetOrigin(Point(nScrX, nScrY));
+        Point aOrigin = aOriginalMode.GetOrigin();
+        aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + nScrX);
+        aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + nScrY);
+        aMap.SetOrigin(aOrigin);
         pContentDev->SetMapMode(aMap);
     }
     else