summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormert <mert.tumer@collabora.com>2021-02-24 06:22:49 +0300
committerMert Tumer <mert.tumer@collabora.com>2021-02-24 09:59:50 +0100
commit3e885c29ff1a295a20fdb8688d2875dd2a5fccd8 (patch)
treeff0dd9fa59e0a9632d75ff058907be30b5994dba
parent17ca3e1bf0fdb6f61e4e481e35d59185e0f62ca7 (diff)
Fix chart sub element rectangle and handle positions
Change-Id: I486b542ae0bb4a987c98d92c1866895eafcf620c Signed-off-by: mert <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111440 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
-rw-r--r--svx/source/svdraw/svdmrkv.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index beda9a2c3621..db05163b1ec4 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -709,7 +709,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxView
tools::Rectangle aSelection(rRect);
bool bIsChart = false;
-
+ Point addLogicOffset = Point(0,0);
if (!rRect.IsEmpty())
{
sal_uInt32 nTotalPaintWindows = this->PaintWindowCount();
@@ -724,6 +724,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxView
{
Point aOffsetPx = pWin->GetOffsetPixelFrom(*pViewShellWindow);
Point aLogicOffset = pWin->PixelToLogic(aOffsetPx);
+ addLogicOffset = aLogicOffset;
aSelection.Move(aLogicOffset.getX(), aLogicOffset.getY());
}
}
@@ -883,8 +884,6 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxView
}
sPolygonElem += R"elem(\" style=\"stroke: none; fill: rgb(114,159,207); fill-opacity: 0.8\"/>)elem";
- aSelection = OutputDevice::LogicToLogic(aSelection, MapMode(MapUnit::MapTwip), MapMode(MapUnit::Map100thMM));
-
OString sSVGElem = R"elem(<svg version=\"1.2\" width=\")elem" +
OString::number(aSelection.GetWidth() / 100.0) +
R"elem(mm\" height=\")elem" +
@@ -928,6 +927,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, SfxView
child.put("kind", kind);
child.put("pointer", static_cast<sal_Int32>(pHdl->GetPointer()));
Point pHdlPos = pHdl->GetPos();
+ pHdlPos.Move(addLogicOffset.getX(), addLogicOffset.getY());
if (convertMapMode)
pHdlPos = OutputDevice::LogicToLogic(pHdlPos, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
point.put("x", pHdlPos.getX());