summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-05-27 22:15:52 +0200
committerEike Rathke <erack@redhat.com>2017-05-29 17:32:42 +0200
commitd903fcf7582341ad4823aff999cbb9dc4d3d860d (patch)
treebd9799f49aac39c9ef6baf606664ab88d8f2b05e
parent83e87f7579ecf63e810c7556661e4f95a8309aff (diff)
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@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit ba5a9132375bcfedebd7c3d2500006161800da3b) Reviewed-on: https://gerrit.libreoffice.org/38112 Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/ui/view/gridwin4.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index f449f7791f3a..cc8b0eeefe30 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