Kaydet (Commit) ee2d0d06 authored tarafından Caolán McNamara's avatar Caolán McNamara

refactor delete code into FuDeleteSelectedObjects

Change-Id: If6929dfae5e284b1201da5505b9c4e5abceedc6d
üst 8ec5b1a2
...@@ -221,6 +221,7 @@ public: ...@@ -221,6 +221,7 @@ public:
void FuTemporary(SfxRequest& rReq); void FuTemporary(SfxRequest& rReq);
void FuPermanent(SfxRequest& rReq); void FuPermanent(SfxRequest& rReq);
void FuSupport(SfxRequest& rReq); void FuSupport(SfxRequest& rReq);
void FuDeleteSelectedObjects();
void FuSupportRotate(SfxRequest& rReq); void FuSupportRotate(SfxRequest& rReq);
void FuTable(SfxRequest& rReq); void FuTable(SfxRequest& rReq);
......
...@@ -624,6 +624,28 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) ...@@ -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) void DrawViewShell::FuSupport(SfxRequest& rReq)
{ {
if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs())
...@@ -871,23 +893,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) ...@@ -871,23 +893,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
pOLV->PostKeyEvent(aKEvt); pOLV->PostKeyEvent(aKEvt);
} }
} }
else if ( mpDrawView->IsPresObjSelected(false, true, false, true) )
{
::sd::Window* pWindow = GetActiveWindow();
InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute();
}
else else
{ {
::vcl::KeyCode aKCode(KEY_DELETE); FuDeleteSelectedObjects();
KeyEvent aKEvt( 0, aKCode);
bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt );
if( !bConsumed && HasCurrentFunction() )
bConsumed = GetCurrentFunction()->KeyInput(aKEvt);
if( !bConsumed && mpDrawView )
mpDrawView->DeleteMarked();
} }
rReq.Ignore (); rReq.Ignore ();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment