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

Stephan Bergmann sbergman at redhat.com
Tue Aug 11 05:54:37 PDT 2015


 sw/source/filter/ww8/ww8scan.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 066c55d4352a0e7930c5fe069a8148fb7f5e4ecf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 11 14:54:00 2015 +0200

    -fsanitize=undefined
    
    ...during CppunitTest_sw_filters_test
    
    Change-Id: Ifa3e4b6e675f2cd789ff4b3428eaf41572390e7f

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index dc5366c..c093976 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2172,7 +2172,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN)
             failure = true;
             // construct FC entries
             // first FC entry of each Fkp
-            if (checkSeek(rSt, ( nPN + i ) << 9 ))
+            if (checkSeek(rSt, static_cast<sal_uInt32>( nPN + i ) << 9 ))
                 continue;
             WW8_CP nFc(0);
             rSt.ReadInt32( nFc );
@@ -6683,7 +6683,7 @@ bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen)
 
     aPLCF.SetIdx( nIdx );               // Lookup suitable CP
     aPLCF.Get( rStart, nEnd, pData );
-    rLen = nEnd - rStart;
+    rLen = static_cast<sal_uInt32>(nEnd) - static_cast<sal_uInt32>(rStart);
     return true;
 }
 


More information about the Libreoffice-commits mailing list