summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatteocam <matteo.campanelli@gmail.com>2015-09-07 16:37:56 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2015-09-20 13:05:16 +0200
commit97a0b23b5de208e7ee864a2e86621c7168d95f72 (patch)
tree0042af22c6eb5e11db5a5f7b179d06a35f1c2579
parentchained editeng: Add methods and basic setup for editing-mode chaining (diff)
downloadcore-97a0b23b5de208e7ee864a2e86621c7168d95f72.tar.gz
core-97a0b23b5de208e7ee864a2e86621c7168d95f72.zip
chained editeng: Enable chaining after a key is pressed
Change-Id: I64351619dd0886f3bb0c080557864c46a17d737d
-rw-r--r--svx/source/svdraw/svdedxv.cxx14
1 files changed, 14 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 9dbf0ab17aaa..0b477cac39cf 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1312,6 +1312,15 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
{
if(pTextEditOutlinerView)
{
+ /* Start special handling of keys within a chain */
+ // We possibly move to another box before any handling
+ bool bHandled = false;
+ TextChainCursorManager *pCursorManager =
+ ImpHandleMotionThroughBoxesKeyInput(rKEvt, pWin, &bHandled);
+ if (bHandled)
+ return true;
+ /* End special handling of keys within a chain */
+
if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
{
if( mpModel )
@@ -1320,6 +1329,11 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
mpModel->SetChanged();
}
+ /* Start chaining processing */
+ ImpChainingEventHdl();
+ ImpMoveCursorAfterChainingEvent(pCursorManager);
+ /* End chaining processing */
+
if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
#ifdef DBG_UTIL
if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();