[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

Caolán McNamara caolanm at redhat.com
Fri Dec 19 01:54:40 PST 2014


 sc/source/filter/excel/xistring.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2645b1979365085edf4a94500f2c610bfc4e668b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 19 09:52:39 2014 +0000

    valgrind: initialize these
    
    Change-Id: I6440832fe508689ffa8e20fa17827528331e3585

diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index c4165dd..e04f4d5 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -118,7 +118,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats,
     {
         for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
         {
-            sal_uInt16 nChar, nFontIdx;
+            sal_uInt16 nChar(0), nFontIdx(0);
             rStrm >> nChar >> nFontIdx;
             AppendFormat( rFormats, nChar, nFontIdx );
         }
@@ -127,7 +127,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats,
     {
         for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
         {
-            sal_uInt8 nChar, nFontIdx;
+            sal_uInt8 nChar(0), nFontIdx(0);
             rStrm >> nChar >> nFontIdx;
             AppendFormat( rFormats, nChar, nFontIdx );
         }
@@ -142,7 +142,7 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormat
     rFormats.reserve( nRunCount );
     for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
     {
-        sal_uInt16 nChar, nFontIdx;
+        sal_uInt16 nChar(0), nFontIdx(0);
         rStrm >> nChar >> nFontIdx;
         rStrm.Ignore( 4 );
         AppendFormat( rFormats, nChar, nFontIdx );


More information about the Libreoffice-commits mailing list