Don't use SetOutlinerParaObject if we are switching to next box

Change-Id: I685252094e90ee26d99d5852a63cf6dcb3dabaa8

1 files changed, 7 insertions, 1 deletions

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 0366545f00c2..dfcbae869f78 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -290,7 +290,13 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
         // uses GetCurrentBoundRect() which needs to take the text into account
         // to work correct
         mbInEditMode = false;
-        SetOutlinerParaObject(pNewText);
+        // We don't want broadcasting if we are merely trying to move to next box (this prevents infinite loops)
+        if (IsChainable() && GetTextChain()->GetSwitchingToNextBox(this)) {
+            GetTextChain()->SetSwitchingToNextBox(this, false);
+            NbcSetOutlinerParaObject(pNewText);
+        } else {
+            SetOutlinerParaObject(pNewText);
+        }
     }
 
     /* Beginning Chaining-related code */