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

[matteocam]

 editeng/source/outliner/outlvw.cxx |    4 ++++
 sd/source/ui/view/sdview.cxx       |    4 ----
 svx/source/svdraw/svdedxv.cxx      |   11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 3b81b9fa231d4b8435b9869c59bd64e7d67cfd6f
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jul 24 18:04:27 2015 +0200

    Move Chaining post-paste to OutlinerView
    
    Change-Id: If869ba6fc27d4c293a003a88c97cd52b71b9d895

diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 88c6d10..987bd0a 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -705,6 +705,10 @@ void OutlinerView::PasteSpecial()
         pEditView->SetEditEngineUpdateMode( true );
         pOwner->UndoActionEnd( OLUNDO_INSERT );
         pEditView->ShowCursor( true, true );
+
+        // XXX: Not sure if this should be called right before ShowCursor
+        if (aEndPasteLink.IsSet())
+            aEndPasteLink.Call(NULL);
     }
 
 }
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9f2a83f..c1135de 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1260,10 +1260,6 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
         }
     }
 
-    /* Chaining handling */
-    ImpChainingEventHdl(NULL);
-    TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj);
-    ImpMoveCursorAfterChainingEvent(pCursorManager);
 }
 
 bool View::ShouldToggleOn(
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index cfc5d33..fb71e2f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -788,8 +788,15 @@ bool SdrObjEditView::SdrBeginTextEdit(
 
             pTextEditOutlinerView->ShowCursor();
             pTextEditOutliner->SetStatusEventHdl(LINK(this,SdrObjEditView,ImpOutlinerStatusEventHdl));
-            if (pTextObj->IsChainable())
-                pTextEditOutliner->SetChainingEventHdl(LINK(this,SdrObjEditView,ImpChainingEventHdl) );
+            if (pTextObj->IsChainable()) {
+                pTextEditOutlinerView->SetEndPasteLinkHdl(LINK(this,SdrObjEditView,ImpChainingEventHdl) );
+                /* We should call:
+                 *
+                    ImpChainingEventHdl(NULL);
+                    TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj);
+                    ImpMoveCursorAfterChainingEvent(pCursorManager);
+                */
+            }
 
 #ifdef DBG_UTIL
             if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();