From 48c400e4fb0778bde199ca771f1ee2586c55a0ff Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Thu, 26 May 2011 22:37:28 -0700 Subject: Fix bug in CloneList Signed-off-by: Petr Mladek --- svx/source/svdraw/clonelist.cxx | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index a39bb2f1f3..a14d469d00 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -85,6 +85,8 @@ SdrObject* CloneList::GetClone(sal_uInt32 nIndex) const void CloneList::CopyConnections() const { + sal_uInt32 cloneCount = maCloneList.size(); + for(sal_uInt32 a = 0; a < maOriginalList.size(); a++) { const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a)); @@ -101,10 +103,17 @@ void CloneList::CopyConnections() const maOriginalList.end(), pOriginalNode1); + sal_uInt32 nPos = it - maOriginalList.begin(); + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_True) != *it) - pCloneEdge->ConnectToNode(sal_True, const_cast(*it)); + SdrObject *cObj = NULL; + + if (nPos < cloneCount) + cObj = GetClone(nPos); + + if(pOriginalEdge->GetConnectedNode(sal_True) != cObj) + pCloneEdge->ConnectToNode(sal_True, cObj); } } @@ -114,10 +123,17 @@ void CloneList::CopyConnections() const maOriginalList.end(), pOriginalNode2); + sal_uInt32 nPos = it - maOriginalList.begin(); + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_True) != *it) - pCloneEdge->ConnectToNode(sal_True, const_cast(*it)); + SdrObject *cObj = NULL; + + if (nPos < cloneCount) + cObj = GetClone(nPos); + + if(pOriginalEdge->GetConnectedNode(sal_False) != cObj) + pCloneEdge->ConnectToNode(sal_False, cObj); } } } -- cgit v1.2.3