diff --git officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index 8ba1a72..a38592e 100644
--- officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -146,6 +146,26 @@
true
+
+
+ 1,0
+
+
+ true
+
+
+ 1
+
+
+ Find
+
+
+ false
+
+
+ false
+
+
--- /dev/null 2011-05-05 07:52:52.262379129 +0100
+++ basctl/uiconfig/basicide/toolbar/findbar.xml 2011-05-05 11:22:54.000000000 +0100
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git basctl/source/basicide/baside2b.cxx basctl/source/basicide/baside2b.cxx
index 5597691..6f1f7e3 100644
--- basctl/source/basicide/baside2b.cxx
+++ 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