|
 |
f325b2 |
From eafd3ee3f01bceef0eb3327be3139a8eee2a2b2e Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Thu, 5 Nov 2015 13:42:13 +0000
|
|
|
f325b2 |
Subject: [PATCH] tdf#95210 SetHandleControllerPosition is busted wrt
|
|
|
f325b2 |
HandleFlags::REFX
|
|
|
f325b2 |
|
|
|
f325b2 |
so instead of saving the initial pos and trying to restore the pos, instead use
|
|
|
f325b2 |
a bigger hammer and save the entire geometry and restore that instead.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Id06ea8f205f30771987089c5dc949bb52adc7a27
|
|
|
f325b2 |
---
|
|
|
f325b2 |
cui/source/tabpages/transfrm.cxx | 16 ++++++++++------
|
|
|
f325b2 |
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
|
|
|
f325b2 |
index f6b1f26..0db63db 100644
|
|
|
f325b2 |
--- a/cui/source/tabpages/transfrm.cxx
|
|
|
f325b2 |
+++ b/cui/source/tabpages/transfrm.cxx
|
|
|
f325b2 |
@@ -633,10 +633,15 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
|
|
|
f325b2 |
SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
|
|
|
f325b2 |
if (eKind == OBJ_CUSTOMSHAPE)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ //save geometry
|
|
|
f325b2 |
+ SdrCustomShapeGeometryItem aInitialGeometry =
|
|
|
f325b2 |
+ static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY));
|
|
|
f325b2 |
+
|
|
|
f325b2 |
EnhancedCustomShape2d aShape(pObj);
|
|
|
f325b2 |
- Point aInitialPosition;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
for (int i = 0; i < 2; ++i)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ Point aInitialPosition;
|
|
|
f325b2 |
if (!aShape.GetHandlePosition(i, aInitialPosition))
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
m_aControlGroups[i]->Enable();
|
|
|
f325b2 |
@@ -655,14 +660,10 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
|
|
|
f325b2 |
aShape.GetHandlePosition(i, aMinPosition);
|
|
|
f325b2 |
|
|
|
f325b2 |
Rectangle aLogicRect = aShape.GetLogicRect();
|
|
|
f325b2 |
+ aInitialPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
|
|
|
f325b2 |
aMaxPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
|
|
|
f325b2 |
aMinPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
|
|
|
f325b2 |
|
|
|
f325b2 |
- aPosition.X = aInitialPosition.X();
|
|
|
f325b2 |
- aPosition.Y = aInitialPosition.Y();
|
|
|
f325b2 |
- aInitialPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
|
|
|
f325b2 |
- aShape.SetHandleControllerPosition(i, aPosition);
|
|
|
f325b2 |
-
|
|
|
f325b2 |
SetMetricValue(*m_aControlX[i], aInitialPosition.X(), ePoolUnit);
|
|
|
f325b2 |
SetMetricValue(*m_aControlY[i], aInitialPosition.Y(), ePoolUnit);
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -681,6 +682,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
|
|
|
f325b2 |
m_aControlY[i]->SetMax(aMaxPosition.Y(), FUNIT_MM);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ //restore geometry
|
|
|
f325b2 |
+ pObj->SetMergedItem(aInitialGeometry);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
for (int i = 0; i < 2; ++i)
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|