[Libreoffice-commits] core.git: svx/source
Mark Hung
marklh9 at gmail.com
Sun Dec 31 07:34:11 UTC 2017
svx/source/svdraw/svdoedge.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 4173798ef73d3fc7da8c5b8fa575a36f05cd6f83
Author: Mark Hung <marklh9 at gmail.com>
Date: Fri Dec 15 22:21:27 2017 +0800
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 at libreoffice.org>
Reviewed-by: Mark Hung <marklh9 at gmail.com>
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;
More information about the Libreoffice-commits
mailing list