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

[Lionel Elie Mamane]

 sw/source/core/tox/tox.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd2abe04a8891bfc5e1b8bad87af60cf4c012010
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Sep 7 08:53:24 2014 +0200

    push explicit cast to minimal expression
    
    Change-Id: I33879aa7724703745728128e59735e5d16aa2a57

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 3e7ac46..98f7599 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -70,12 +70,12 @@ static void lcl_FillAuthPattern(SwFormTokens &rAuthTokens, sal_uInt16 nTypeId)
         AUTH_FIELD_AUTHOR,
         AUTH_FIELD_TITLE,
         AUTH_FIELD_YEAR,
-        static_cast<sal_uInt16>(nTypeId == AUTH_TYPE_WWW ? AUTH_FIELD_URL : USHRT_MAX)
+        nTypeId == AUTH_TYPE_WWW ? static_cast<sal_uInt16>(AUTH_FIELD_URL) : SAL_MAX_UINT16
     };
 
     for(size_t i = 0; i < SAL_N_ELEMENTS(nVals); ++i)
     {
-        if(nVals[i] == USHRT_MAX)
+        if(nVals[i] == SAL_MAX_UINT16)
             break;
         if( i > 0 )
             rAuthTokens.push_back( aTextToken );