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

[Noel Power]

 basctl/source/basicide/baside2b.cxx          |    9 +++++----
 basctl/uiconfig/basicide/toolbar/findbar.xml |    8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 3db1a4235ac588cda2836f99091888583b461810
Author: Noel Power <noel.power at novell.com>
Date:   Thu May 5 19:02:59 2011 +0100

    fix for #fdo35706 - ( Ctrl-F & Ctrl-Alt-F don't work in basic IDE )

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 5597691..6f1f7e3 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -411,11 +411,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
     long nLinSz = pModulWindow->GetHScrollBar()->GetLineSize(); (void)nLinSz;
     long nThumb = pModulWindow->GetHScrollBar()->GetThumbPos(); (void)nThumb;
 #endif
-    sal_Bool bDone = sal_False;
     sal_Bool bWasModified = pEditEngine->IsModified();
-    if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
+    // see if there is an accelerator to be processed first
+    sal_Bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+
+    if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify()  ) )
     {
-        if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
+        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() )
             bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
@@ -442,7 +444,6 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
     }
     if ( !bDone )
     {
-        if ( !SfxViewShell::Current()->KeyInput( rKEvt ) )
             Window::KeyInput( rKEvt );
     }
     else
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml
new file mode 100644
index 0000000..0338d31
--- /dev/null
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+  <toolbar:toolbaritem xlink:href=".uno:FindText"/>
+  <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
+  <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
+  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
+</toolbar:toolbar>