diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:14:45 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:14:45 +0000 |
commit | 4afa610a1ad07f1d57f78898bb2fca77758927c4 (patch) | |
tree | 98af08895a728085265549b1df932a47c0728a3f /svtools/source/brwbox/editbrowsebox.cxx | |
parent | 66fe00c1552f9438e28dece96031e0c58c5d93b4 (diff) |
INTEGRATION: CWS dba30b (1.31.216); FILE MERGED
2008/04/15 21:50:39 fs 1.31.216.2: RESYNC: (1.31-1.32); FILE MERGED
2008/03/05 12:34:20 oj 1.31.216.1: #ii53310# replace shift+space with ctrl+shift+space to select a column
Diffstat (limited to 'svtools/source/brwbox/editbrowsebox.cxx')
-rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index ca8bc8f48b94..3e16e10866f3 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editbrowsebox.cxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.33 $ * * This file is part of OpenOffice.org. * @@ -704,13 +704,18 @@ namespace svt case KEY_UP: nId = BROWSER_SELECTUP; bLocalSelect = sal_True;break; case KEY_HOME: nId = BROWSER_SELECTHOME; bLocalSelect = sal_True;break; case KEY_END: nId = BROWSER_SELECTEND; bLocalSelect = sal_True;break; - case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break; case KEY_TAB: if (IsTabAllowed(sal_False)) nId = BROWSER_CURSORLEFT; break; } + if ( !bAlt && bCtrl && bShift ) + switch ( nCode ) + { + case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break; + } + if ( !bAlt && bCtrl && !bShift ) switch ( nCode ) @@ -733,7 +738,7 @@ namespace svt ) ) { - if (nId == BROWSER_SELECT) + if (nId == BROWSER_SELECT || BROWSER_SELECTCOLUMN == nId ) { // save the cell content (if necessary) if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified()) |