summaryrefslogtreecommitdiff
path: root/basctl/source
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2011-05-05 19:02:59 +0100
committerNoel Power <noel.power@novell.com>2011-05-05 19:02:59 +0100
commit3db1a4235ac588cda2836f99091888583b461810 (patch)
tree2095bf51fbaf797faa3b4676f9e1873b27d65cf4 /basctl/source
parent5a0c474fd046907aa64c93f7c497925fb2a27454 (diff)
fix for #fdo35706 - ( Ctrl-F & Ctrl-Alt-F don't work in basic IDE )
Diffstat (limited to 'basctl/source')
-rw-r--r--basctl/source/basicide/baside2b.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 559769134..6f1f7e3df 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