Merge remote-tracking branch 'origin/libreoffice-3-4'

basctl/sdi/baside.sdi

@@ -57,6 +57,11 @@ shell BasicIDEShell
         StateMethod = GetState;
     ]
 
+    SID_SELECTALL
+    [
+        ExecMethod  = ExecuteCurrent;
+    ]
+
     SID_CUT
     [
         ExecMethod  = ExecuteCurrent;

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();

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
         {

cui/source/options/optsave.cxx

@@ -544,7 +544,6 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
         {
             aAutoSaveEdit.Enable();
             aMinuteFT.Enable();
-            aAutoSaveEdit.GrabFocus();
         }
         else
         {