diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-27 15:19:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-27 15:38:32 +0200 |
| commit | 97e6ff086e2601c066c32fca8412e939843dae3f (patch) | |
| tree | 7e7909169b31f1018af5eefdea22c1578ef31199 /sw | |
| parent | 8054a7dc0a1b9c27aea7717f58891e49bd25d14c (diff) | |
Revert "Resolves: #119652# avoid invalid selection on..."
This reverts commit e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d.
The problem was already solved with
af4b6c94c68b5f67b931cde8d0acda6ec8b288bb.
Change-Id: I21d7ca9fec601377967297bc42835573422c29a7
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/wrtsh/delete.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/wrtsh4.cxx | 5 |
2 files changed, 3 insertions, 14 deletions
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 940a41148087..f19455e0d681 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -446,17 +446,7 @@ long SwWrtShell::DelToStartOfSentence() if(IsStartOfDoc()) return 0; OpenMark(); - - SwCrsrSaveState aSaveState( *(_GetCrsr()) ); - sal_Bool bSuccessfulSelection = _BwdSentence(); - if ( _GetCrsr()->IsInProtectTable( sal_True ) - || _GetCrsr()->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | - nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) ) - { - bSuccessfulSelection = sal_False; - } - long nRet = bSuccessfulSelection ? Delete() : 0; - + long nRet = _BwdSentence() ? Delete() : 0; CloseMark( 0 != nRet ); return nRet; } diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index 62772766fc4a..6966e45c4fda 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -198,15 +198,14 @@ sal_Bool SwWrtShell::_BwdSentence() if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS)) { Pop(sal_False); - return sal_False; + return 0; } if( !GoStartSentence() && !IsSttPara() ) // not found --> go to the beginning of the paragraph SwCrsrShell::MovePara( fnParaCurr, fnParaStart ); ClearMark(); Combine(); - - return sal_True; + return 1; } sal_Bool SwWrtShell::_FwdPara() |