diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-06 15:18:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-06 16:07:08 +0000 |
| commit | ee2d0d06445b44c3a69b9b0cdd1b474063fed521 (patch) | |
| tree | 82d1d8247e7fad6de663b11887fc2b08f4904c63 /sd | |
| parent | 8ec5b1a267b229aec50c40c6d2acec1ad48da4b1 (diff) | |
refactor delete code into FuDeleteSelectedObjects
Change-Id: If6929dfae5e284b1201da5505b9c4e5abceedc6d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 38 |
2 files changed, 24 insertions, 15 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 42fbabe36d6a..411090716875 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -221,6 +221,7 @@ public: void FuTemporary(SfxRequest& rReq); void FuPermanent(SfxRequest& rReq); void FuSupport(SfxRequest& rReq); + void FuDeleteSelectedObjects(); void FuSupportRotate(SfxRequest& rReq); void FuTable(SfxRequest& rReq); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 99fd3547f5e0..f9b0be31cd56 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -624,6 +624,28 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } } +void DrawViewShell::FuDeleteSelectedObjects() +{ + if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) + { + ::sd::Window* pWindow = GetActiveWindow(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); + } + else + { + ::vcl::KeyCode aKCode(KEY_DELETE); + KeyEvent aKEvt( 0, aKCode); + + bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); + + if( !bConsumed && HasCurrentFunction() ) + bConsumed = GetCurrentFunction()->KeyInput(aKEvt); + + if( !bConsumed && mpDrawView ) + mpDrawView->DeleteMarked(); + } +} + void DrawViewShell::FuSupport(SfxRequest& rReq) { if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) @@ -871,23 +893,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) pOLV->PostKeyEvent(aKEvt); } } - else if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) - { - ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); - } else { - ::vcl::KeyCode aKCode(KEY_DELETE); - KeyEvent aKEvt( 0, aKCode); - - bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); - - if( !bConsumed && HasCurrentFunction() ) - bConsumed = GetCurrentFunction()->KeyInput(aKEvt); - - if( !bConsumed && mpDrawView ) - mpDrawView->DeleteMarked(); + FuDeleteSelectedObjects(); } rReq.Ignore (); } |