[Libreoffice-commits] core.git: sw/inc

Noel Grandin noel at peralex.com
Wed Dec 4 01:50:39 PST 2013


 sw/inc/splargs.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 564ee696c9dfe1ee39515fe69e50ecdce2a03b4e
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 4 11:47:58 2013 +0200

    fix SwInterHyphInfo commit again
    
    The original commit was eb56848029a3b26a9d4f07a55364749e9e7d8339
    "convert SwInterHyphInfo from xub_StrLen->sal_Int32"
    
    My first attempt at fixing the commit was
    a073e81c3acb0c4aa3bc4fde146b6eb9869738e1.
    
    This is the second attempt.
    
    Change-Id: I030c0a3107e1321006744473efe3ca3341251ad4

diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 9b56a21..fae40a1 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -144,7 +144,7 @@ public:
          : aCrsrPos( rCrsrPos ),
            bNoLang(sal_False), bCheck(sal_False),
            nStart(nStartPos),
-           nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : (std::min(SAL_MAX_INT32, nStartPos + nLength)) ),
+           nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos + nLength ),
            nWordStart(0), nWordLen(0),
            nHyphPos(0), nMinTrail(0)
          { }


More information about the Libreoffice-commits mailing list