summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-03-24 10:01:55 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-30 09:23:42 +0200
commite23af8be459a6099704c87129a75074c69d13364 (patch)
tree09cb5a63eb174d1a77f954f71f9fc31d7f8d9d54 /svx
parentd0e6250a56ec5da709f3e813ce0b7df0958a0e8a (diff)
svx tiled rendering: fix Impress graphic selection
With this, shapes on Impress slides can be selected and the graphic selection appears correctly around the expected shape. Change-Id: Ie819918a34952e8182553b26ff892fe9b5ae0258
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdmrkv.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index fbd803d71e66..03bc2fbce6a2 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -710,7 +710,19 @@ void SdrMarkView::SetMarkHandles()
if (aRect.IsEmpty())
sRectangle = "EMPTY";
else
+ {
+ // In case the map mode is in 100th MM, then need to convert the coordinates over to twips for LOK.
+ if (pMarkedPV)
+ {
+ if (OutputDevice* pOutputDevice = pMarkedPV->GetView().GetFirstOutputDevice())
+ {
+ if (pOutputDevice->GetMapMode().GetMapUnit() == MAP_100TH_MM)
+ aRect = OutputDevice::LogicToLogic(aRect, MAP_100TH_MM, MAP_TWIP);
+ }
+ }
+
sRectangle = aRect.toString();
+ }
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sRectangle.getStr());
}