[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
Tamás Zolnai
tamas.zolnai at collabora.com
Wed May 31 15:37:46 UTC 2017
sc/source/ui/view/gridwin4.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ddcd9c3a6e78131d511e91f832ab33c41d41916d
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/38280
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 8f5159b19742..74151217831c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -758,7 +758,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
More information about the Libreoffice-commits
mailing list