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

[matteocam]

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

New commits:
commit 30e74050503faf5e49ebad7d682bfab43d5cccbe
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Aug 21 00:36:40 2015 +0200

    Simply set the SdrText's ParaObj
    
    Change-Id: Ic4454474f31d4a013ebb1f69382e1e688e332813

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index dfcbae8..4ab5f68 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -293,7 +293,8 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
         // 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);
+            if( getActiveText() )
+                getActiveText()->SetOutlinerParaObject( pNewText);
         } else {
             SetOutlinerParaObject(pNewText);
         }