[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basctl/sdi basctl/source

[Jan Holesovsky]

 basctl/sdi/baside.sdi               |    5 +++++
 basctl/source/basicide/baside2.cxx  |    9 +++++++++
 basctl/source/basicide/baside2b.cxx |    4 +---
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 7a385f2256b88c6ee52c0beb1375d0a945f38d51
Author: Noel Power <nopower at novell.com>
Date:   Wed May 18 11:15:14 2011 +0200

    Fix 'Ctrl+A' in the Basic IDE - fdo#37211.
    
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 36adfc8..e127b67 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 772094d..b80cfb2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -999,6 +999,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 6f1f7e3..df99a5b 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
         {