[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
Caolán McNamara
caolanm at redhat.com
Wed Feb 11 06:56:34 PST 2015
sw/source/core/undo/unnum.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f45183c3c652b2c023d571ef56775ce5d3b27d2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 11 14:02:08 2015 +0000
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/14419
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index cb7e6f6..27456c98 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 );
More information about the Libreoffice-commits
mailing list