From 1191f4e432d3cb49662e6133411af3a2faf10a7a Mon Sep 17 00:00:00 2001
From: "Uray M. János" <uray.janos@gmail.com>
Date: Thu, 30 Aug 2012 10:18:14 +0200
Subject: 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>
---
 basctl/source/basicide/baside2b.cxx | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'basctl/source/basicide/baside2b.cxx')

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 )
     {
-- 
cgit