diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 14:42:23 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 14:42:23 +0000 |
| commit | ad332878ff937a6763dbaa7be01773cacbf70459 (patch) | |
| tree | 44ba889ae35e3fde0fd202b9b7455d84c60ed808 /sw/source/ui/wrtsh | |
| parent | 13a18a46cd39fddaade28a053876aa9edf9e3209 (diff) | |
INTEGRATION: CWS swcolsel (1.11.34); FILE MERGED
2007/11/08 10:34:05 ama 1.11.34.1: Fix #83261#: Ctrl+Home should not reset block mode
Diffstat (limited to 'sw/source/ui/wrtsh')
| -rw-r--r-- | sw/source/ui/wrtsh/move.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index 865cafa76dcb..d814d6c9d6fb 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -4,9 +4,9 @@ * * $RCSfile: move.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2007-09-27 12:52:48 $ + * last change: $Author: ihi $ $Date: 2007-11-22 15:42:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,10 +243,13 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, if ( IsCrsrInTbl() ) { const BOOL bBoxSelection = HasBoxSelection(); - if ( !bSelect ) - EnterStdMode(); - else - SttSelect(); + if( !bBlockMode ) + { + if ( !bSelect ) + EnterStdMode(); + else + SttSelect(); + } // Tabellenzelle? if ( !bBoxSelection && (MoveSection( fnSectionCurr, fnSectionStart) || bDontMoveRegion)) @@ -273,10 +276,13 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable, } } - if ( !bSelect ) - EnterStdMode(); - else - SttSelect(); + if( !bBlockMode ) + { + if ( !bSelect ) + EnterStdMode(); + else + SttSelect(); + } const USHORT nFrmType = GetFrmType(0,FALSE); if ( FRMTYPE_FLY_ANY & nFrmType ) { |