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

[matteocam]

 editeng/source/editeng/impedit3.cxx |    2 +-
 svx/source/svdraw/svdedxv.cxx       |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 89c288be6f20141ad6e29374dc3c4e7084dcc348
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Tue Jul 14 20:03:31 2015 -0400

    Handle UF/OF from KeyInput only
    
    Change-Id: Icf9a248450ac6e03d6aab6c3e7d202aab7b3a171

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 82fd6cd..f564a78 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -481,7 +481,7 @@ void ImpEditEngine::FormatDoc()
 
     //FIXME(matteocam)
 
-    CallChainingEventHdl(); // For chaining
+    //CallChainingEventHdl(); // For chaining
 
     LeaveBlockNotifications();
 }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 7314e41..4bbb28d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -540,11 +540,12 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
     OutlinerView* pOLV = GetTextEditOutlinerView();
 
     TextChain *pTextChain = pTextObj->GetTextChain();
+    ESelection aNewSel = pTextChain->GetPostChainingSel(pTextObj);
 
     switch ( pTextChain->GetCursorEvent(pTextObj) ) {
 
             case CursorChainingEvent::UNCHANGED:
-                // Set same selection as before the chainging
+                // Set same selection as before the chaining
                 // We need an explicit set because the Outliner is messed up
                 //    after text transfer and otherwise it brings us at arbitrary positions.
                 pOLV->SetSelection(pTextChain->GetPreChainingSel(pTextObj));
@@ -554,8 +555,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
                 SdrBeginTextEdit(pNextLink);
                 // OutlinerView has changed, so we update the pointer
                 pOLV = GetTextEditOutlinerView();
-                pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); // XXX
-
+                pOLV->SetSelection(aNewSel); // XXX
                 break;
             case CursorChainingEvent::TO_PREV_LINK:
                 // XXX: To be handled
@@ -1294,14 +1294,17 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
                     pMod->SetChanged( true );
             }
 
+            // FIXME(matteocam)
+            ImpChainingEventHdl(NULL);
+            ImpMoveCursorAfterChainingEvent();
+
             if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
 #ifdef DBG_UTIL
             if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
 #endif
             ImpMakeTextCursorAreaVisible();
 
-            // FIXME(matteocam)
-            ImpMoveCursorAfterChainingEvent();
+
 
             return true;
         }