diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 12:53:09 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 12:53:09 +0200 |
| commit | a293befc764472ef63a94c7365bd1a1c5c956cf9 (patch) | |
| tree | 1f0a6e6affd60160ce1698dd03bdb13fadaa4ff0 /basctl | |
| parent | 6a9ac34b469b2f7f7df8a9be7e00944c8871322d (diff) | |
| parent | ff2af03b4838416b5b276cac40180154bf8a00a0 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/sdi/baside.sdi | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2.cxx | 9 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi index bc9232c08bfd..f40e239b01bf 100644 --- a/basctl/sdi/baside.sdi +++ b/basctl/sdi/baside.sdi @@ -57,6 +57,11 @@ shell BasicIDEShell StateMethod = GetState; ] + SID_SELECTALL + [ + ExecMethod = ExecuteCurrent; + ] + SID_CUT [ ExecMethod = ExecuteCurrent; diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 8ae614a24787..294bda74f8fe 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -995,6 +995,15 @@ void ModulWindow::ExecuteCommand( SfxRequest& rReq ) sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { + case SID_DELETE: + { + KeyEvent aFakeDelete( 0, KEY_DELETE ); + GetEditView()->KeyInput( aFakeDelete ); + break; + } + case SID_SELECTALL: + GetEditView()->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) ); + break; case SID_BASICRUN: { BasicRun(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 7142417cd243..28df6b14ccea 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -417,9 +417,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() ) ) { - if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsMod2() ) - pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) ); - else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() ) + if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() ) bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog else { |