summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-02 15:10:50 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-07 09:18:14 +0200
commita9373a3fec4f1bd9b51c40666a12ffd9eb7357a2 (patch)
tree7a930e7ab1e30ccc2e4a746bf4fc4f4561787d09 /sd
parentc768fc150b62b1b1cd85f23efb5b5e964c89290b (diff)
vcl tiled rendering: don't do anything with disabled mapmode and mm100 mapunit
Turns out Impress wants an mm100 -> twips conversion in this case, while Calc wants a pixel -> twips one, so there isn't anything here that can be abstracted in VCL. Change-Id: Ieb961afa97affbf682e13c0a56585396ae09f552
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/sdwindow.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 1268596c7042..8506ec0d492e 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1003,7 +1003,12 @@ void Window::LogicInvalidate(const Rectangle* pRectangle)
if (!pRectangle)
sRectangle = "EMPTY";
else
- sRectangle = pRectangle->toString();
+ {
+ Rectangle aRectangle(*pRectangle);
+ if (GetMapMode().GetMapUnit() == MAP_100TH_MM)
+ aRectangle = OutputDevice::LogicToLogic(aRectangle, MAP_100TH_MM, MAP_TWIP);
+ sRectangle = aRectangle.toString();
+ }
mpViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr());
}