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

[matteocam]

 svx/source/svdraw/svdedxv.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit bc4cc289ad04b6a80f6558c9577950395e8141c6
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jul 6 14:47:18 2015 -0400

    Set empty chaining link after edit ends. Error msg for OutlView.
    
    Change-Id: I693f7a884274de0f98a26b3e4d197501877289af

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c775ab1..34e12d2 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -486,10 +486,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
     if(pTextEditOutliner )
     {
         SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
-        if( pTextObj )
+        OutlinerView* pOLV = GetTextEditOutlinerView();
+        if( pTextObj && pOLV)
         {
-            OutlinerView* pOLV = GetTextEditOutlinerView();
-            assert(pOLV);
             // Save previous selection pos
             ESelection aPreChainingSel(pOLV->GetSelection());
 
@@ -511,6 +510,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 
             pOLV->SetSelection(aPreChainingSel);
 
+        } else {
+            // XXX
+            fprintf(stderr, "[OnChaining] No Edit Outliner View\n");
         }
     }
     return 0;
@@ -947,6 +949,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
             pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
             pTEOutliner->SetEndPasteOrDropHdl(Link<>());
 
+            pTEOutliner->SetChainingEventHdl(Link<>());
+
             const bool bUndo = IsUndoEnabled();
             if( bUndo )
             {