[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e5c4ba278c26e76564c542adb4df7610f741301b
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Aug 4 12:14:21 2015 +0200

    Add check when setting next->prev->next to this
    
    Change-Id: I5ffa368c780ba06d76196073805327fbb3b7fa48

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1b47e56..e61088b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2153,7 +2153,9 @@ void SdrTextObj::SetNextLinkInChain(SdrTextObj *pNextObj)
 
     // Deal with new next link's prev link
     if (mpNextInChain) {
-        if (mpNextInChain->mpPrevInChain)
+        // If there is a prev already at all and this is not already the current object
+        if (mpNextInChain->mpPrevInChain &&
+            mpNextInChain->mpPrevInChain != this)
             mpNextInChain->mpPrevInChain->mpNextInChain = NULL;
         mpNextInChain->mpPrevInChain = this;
     }