summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2017-12-15 22:21:27 +0800
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-01-10 12:41:52 +0100
commit37052f28ff18a0d74c482f6169a3d02a7bd960fa (patch)
treeb10ed9142b8fbd015cf42cc6352278743910ec2f /svx/source
parent20b6a86414cd6888185d95cd480fc95f8fc0e6b0 (diff)
tdf#51188: allow connector gluepoint undo
It should had overwritten the connector data when the connector attach to a different glue point of the same object. Let’s always overwrite it, though it waste a little bit time. Change-Id: Ib4cc4bf105e5ef17289e027dcddd0110f7297190 Reviewed-on: https://gerrit.libreoffice.org/46559 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit 4173798ef73d3fc7da8c5b8fa575a36f05cd6f83) Reviewed-on: https://gerrit.libreoffice.org/47248 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdoedge.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 02ef84946b31..150fbc2b8811 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2449,11 +2449,17 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
aCon1=rEGeo.aCon1;
if (aCon1.pObj!=nullptr) aCon1.pObj->AddListener(*this);
}
+ else
+ aCon1=rEGeo.aCon1;
+
if (aCon2.pObj!=rEGeo.aCon2.pObj) {
if (aCon2.pObj!=nullptr) aCon2.pObj->RemoveListener(*this);
aCon2=rEGeo.aCon2;
if (aCon2.pObj!=nullptr) aCon2.pObj->AddListener(*this);
}
+ else
+ aCon2=rEGeo.aCon2;
+
*pEdgeTrack =*rEGeo.pEdgeTrack;
bEdgeTrackDirty=rEGeo.bEdgeTrackDirty;
bEdgeTrackUserDefined=rEGeo.bEdgeTrackUserDefined;