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

[matteocam]

 editeng/source/outliner/outlvw.cxx |    1 +
 include/editeng/outliner.hxx       |    1 +
 svx/source/svdraw/svdedxv.cxx      |    5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit cd87130df7a95691e2e73af0076b02f6a6143cf4
Author: matteocam <matteo.campane...@gmail.com>
Date:   Mon Jul 20 14:46:10 2015 -0400

    Call chaining handling from end-of-paste handler
    
    Change-Id: I4b11d98558d2deb6fb4465eb98b383d5a5f5f0c9

diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 1a9e10b..88c6d10 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -706,6 +706,7 @@ void OutlinerView::PasteSpecial()
         pOwner->UndoActionEnd( OLUNDO_INSERT );
         pEditView->ShowCursor( true, true );
     }
+
 }
 
 void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList)
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index dcdc3db..e1a4c91 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -215,6 +215,7 @@ private:
     EDITENG_DLLPRIVATE void         ImpPasted( sal_Int32 nStart, sal_Int32 
nPrevParaCount, sal_Int32 nSize);
     EDITENG_DLLPRIVATE sal_Int32    ImpCalcSelectedPages( bool 
bIncludeFirstSelected );
 
+
 public:
                 OutlinerView( Outliner* pOut, vcl::Window* pWindow );
     virtual     ~OutlinerView();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3ac3c1e..774c974 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1294,7 +1294,6 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
         ESelection aCurSel = pTextEditOutlinerView->GetSelection();
 
 
-
         SdrTextObj* pTextObj = NULL;
         if (mxTextEditObj.is())
             pTextObj= dynamic_cast<SdrTextObj*>(mxTextEditObj.get());
@@ -1341,8 +1340,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
             }
 
             // FIXME(matteocam)
+            // Start chaining processing
             ImpChainingEventHdl(NULL);
             ImpMoveCursorAfterChainingEvent();
+            // End chaining processing
 
             if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
 #ifdef DBG_UTIL
@@ -2036,6 +2037,8 @@ void SdrObjEditView::OnBeginPasteOrDrop( 
PasteOrDropInfos* )
 void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* )
 {
     // applications can derive from these virtual methods to do something 
before a drop or paste operation
+    ImpChainingEventHdl(NULL);
+
 }
 
 sal_uInt16 SdrObjEditView::GetSelectionLevel() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits