diff options
Diffstat (limited to 'svx/source/form/fmview.cxx')
| -rw-r--r-- | svx/source/form/fmview.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index cdd344377a..5911ed4ca9 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #undef REFERENCE #endif #include <svtools/ehdl.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/sdbc/XConnection.hpp> @@ -61,6 +61,7 @@ #include <svx/fmpage.hxx> #include <svx/fmshell.hxx> #include "fmpgeimp.hxx" +#include "svx/fmtools.hxx" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmprop.hrc" @@ -476,7 +477,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ ) { const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i); - + if( rPageWindow.GetControlContainer( false ) == xCC ) { pImpl->addWindow(rPageWindow); @@ -516,15 +517,15 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { BOOL bDone = FALSE; const KeyCode& rKeyCode = rKEvt.GetKeyCode(); - if ( IsDesignMode() + if ( IsDesignMode() && rKeyCode.GetCode() == KEY_RETURN ) { // RETURN alone enters grid controls, for keyboard accessibility - if ( pWin - && !rKeyCode.IsShift() - && !rKeyCode.IsMod1() - && !rKeyCode.IsMod2() + if ( pWin + && !rKeyCode.IsShift() + && !rKeyCode.IsMod1() + && !rKeyCode.IsMod2() ) { FmFormObj* pObj = getMarkedGrid(); |