diff options
| author | Uray M. János <uray.janos@gmail.com> | 2012-08-30 10:18:14 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-08-30 12:50:52 +0000 |
| commit | 1191f4e432d3cb49662e6133411af3a2faf10a7a (patch) | |
| tree | 3ea66c29bac661a2755376f8df8991b44e8b50fe /basctl/source | |
| parent | 9ec0a3ec629a05809852728482fdb3f3d997edef (diff) | |
Undo/Redo description+shortcut in Basic IDE
This solves an issue about Edit > Redo in BasicIDE (Hungarian site):
http://bug.openscope.org/browse/OOO-269
1. Redo should have a shortcut (Ctrl+Y), like in other parts of
LibreOffice. (Undo has the usual Ctrl+Z.)
2. In the Edit menu, Undo and Redo should print something after the
colon (what is to be undone, redone).
This patch fixes both.
Unfortunately the shortcut isn't shown in the menu (it's in
vcl/source/window/keycod.cxx like Undo, and not in
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu).
Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
Reviewed-on: https://gerrit.libreoffice.org/514
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'basctl/source')
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 41e31c7e49c4..a184d060178a 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -464,28 +464,23 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() ) ) { - if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() ) - bDone = true; - else + if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB ) && !rKEvt.GetKeyCode().IsMod1() && + !rKEvt.GetKeyCode().IsMod2() && !GetEditView()->IsReadOnly() ) { - if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB ) && !rKEvt.GetKeyCode().IsMod1() && - !rKEvt.GetKeyCode().IsMod2() && !GetEditView()->IsReadOnly() ) + TextSelection aSel( pEditView->GetSelection() ); + if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() ) { - TextSelection aSel( pEditView->GetSelection() ); - if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() ) - { - bDelayHighlight = false; - if ( !rKEvt.GetKeyCode().IsShift() ) - pEditView->IndentBlock(); - else - pEditView->UnindentBlock(); - bDelayHighlight = true; - bDone = true; - } + bDelayHighlight = false; + if ( !rKEvt.GetKeyCode().IsShift() ) + pEditView->IndentBlock(); + else + pEditView->UnindentBlock(); + bDelayHighlight = true; + bDone = true; } - if ( !bDone ) - bDone = pEditView->KeyInput( rKEvt ); } + if ( !bDone ) + bDone = pEditView->KeyInput( rKEvt ); } if ( !bDone ) { |