diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-11 14:02:08 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-20 11:53:56 +0000 |
| commit | c6f09d55596c3e872133f319984bff20b1399407 (patch) | |
| tree | 7cbf758bcaf73d95243ca9573efacb39b79e2118 | |
| parent | 8a8734b582b756476f74cd046268c7fd117e46f7 (diff) | |
Resolves: tdf#89179 fix Undo of Numbering Level change crash
regression from long paras presumably
Change-Id: Ib89169e52e42fcbe6f8e1ab0a2eb9871d38ff06d
(cherry picked from commit 29d2666d92e1105473f339609ba59e54a286b71c)
Reviewed-on: https://gerrit.libreoffice.org/14420
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f70bfb28c396dcd9184f1c0c8ad4644e38394bce)
Reviewed-on: https://gerrit.libreoffice.org/14425
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/core/undo/unnum.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index cb7e6f6f3986..27456c98a9ee 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -52,7 +52,7 @@ SwUndoInsNum::SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule, sReplaceRule( rReplaceRule ), nLRSavePos( 0 ) { // No selection! - nEndNode = 0, nEndCntnt = USHRT_MAX; + nEndNode = 0, nEndCntnt = COMPLETE_STRING; nSttNode = rPos.nNode.GetIndex(); nSttCntnt = rPos.nContent.GetIndex(); } @@ -224,7 +224,7 @@ void SwUndoMoveNum::UndoImpl(::sw::UndoRedoContext & rContext) { sal_uLong nTmpStt = nSttNode, nTmpEnd = nEndNode; - if( nEndNode || USHRT_MAX != nEndCntnt ) // section? + if (nEndNode || nEndCntnt != COMPLETE_STRING) // section? { if( nNewStt < nSttNode ) // moved forwards nEndNode = nEndNode - ( nSttNode - nNewStt ); |