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

[matteocam]

 include/svx/textchain.hxx     |    5 +++--
 svx/source/svdraw/svdedxv.cxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit bfc9fc2eaa7d27bcadc99aa1ea277a83abc69ef9
Author: matteocam <matteo.campane...@gmail.com>
Date:   Wed Jul 8 11:46:22 2015 -0400

    Add and handle CursorChainEvent::NULL_EVENT
    
    Change-Id: I051b2487593271a5b689ba586a6cc1619e77b4a6

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 77e3b32..7920a72 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -84,7 +84,8 @@ enum class CursorChainingEvent
 {
     TO_NEXT_LINK,
     TO_PREV_LINK,
-    UNCHANGED
+    UNCHANGED,
+    NULL_EVENT
 };
 
 /*
@@ -113,7 +114,7 @@ class ImpChainLinkProperties
 
     ImpChainLinkProperties() {
         INIT_CHAIN_PROP(NilChainingEvent, false)
-        INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+        INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::NULL_EVENT)
         INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
     }
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2b165c7..d893dab 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -553,7 +553,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
     }
 
     // Reset event
-    pTextChain->SetCursorEvent(pTextObj, CursorChainingEvent::UNCHANGED);
+    pTextChain->SetCursorEvent(pTextObj, CursorChainingEvent::NULL_EVENT);
 
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits