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

[Miklos Vajna]

 writerfilter/source/rtftok/rtftokenizer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba96008a02fa3d1675ac2cc0b9310736a8b75041
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 31 09:24:14 2016 +0200

    writerfilter: use sal_Size for offset values in RTFTokenizer::resolveParse()
    
    This way
    
    nCurrentPos > (nLastPos + nPercentSize)
    
    doesn't do suboptimal add of two values, then truncate to int precision,
    then compare against long.
    
    Change-Id: Id2f380116a05e98fd073a58652c106bf88d13981
    Reviewed-on: https://gerrit.libreoffice.org/28537
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 83ecf69..4b7f76c 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -59,8 +59,8 @@ RTFError RTFTokenizer::resolveParse()
     RTFError ret;
     // for hex chars
     int b = 0, count = 2;
-    sal_uInt32 nPercentSize = 0;
-    sal_uInt32 nLastPos = 0;
+    sal_Size nPercentSize = 0;
+    sal_Size nLastPos = 0;
 
     if (m_xStatusIndicator.is())
     {