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

[Caolán McNamara]

 filter/source/graphicfilter/etiff/etiff.cxx |   18 ++++++++++++++++++
 sw/source/core/tox/tox.cxx                  |    4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 58f5f3b10783185d761065582b1aa18736198e39
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 26 10:40:47 2014 +0100

    WaE: -Werror=shadow
    
    Change-Id: Ia29ebbddd5c88b8f3bd033a97dfd69a7705b87b8

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 1e1a435..f0f0495 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -402,8 +402,8 @@ sal_uInt16 SwForm::GetFormMaxLevel( TOXTypes eTOXType )
 
 void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
 {
-    const sal_uInt16 nFormMaxLevel = GetFormMax();
-    for ( sal_uInt16 nLevel = 1; nLevel < nFormMaxLevel; ++nLevel )
+    const sal_uInt16 nFormMax = GetFormMax();
+    for ( sal_uInt16 nLevel = 1; nLevel < nFormMax; ++nLevel )
     {
         SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( GetTemplate(nLevel) );
         if( pColl == NULL )
commit 9c0def7a18f827cf58e28127309227177b1f42f0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 26 10:28:15 2014 +0100

    coverity#738633 Uninitialized pointer field
    
    Change-Id: I46084f663d8089d8bcf865774ced72a9b655e811

diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index ffa253c..07677b6 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -117,15 +117,33 @@ public:
 
 TIFFWriter::TIFFWriter(SvStream &rStream)
     : m_rOStm(rStream)
+    , mnStreamOfs(0)
     , mbStatus(true)
     , mpAcc(NULL)
+    , mnWidth(0)
+    , mnHeight(0)
+    , mnColors(0)
     , mnCurAllPictHeight(0)
     , mnSumOfAllPictHeight(0)
+    , mnBitsPerPixel(0)
     , mnLastPercent(0)
+    , mnLatestIfdPos(0)
+    , mnTagCount(0)
+    , mnCurrentTagCountPos(0)
     , mnXResPos(0)
     , mnYResPos(0)
+    , mnPalPos(0)
     , mnBitmapPos(0)
     , mnStripByteCountPos(0)
+    , pTable(NULL)
+    , pPrefix(NULL)
+    , nDataSize(0)
+    , nClearCode(0)
+    , nEOICode(0)
+    , nTableSize(0)
+    , nCodeSize(0)
+    , nOffset(0)
+    , dwShift(0)
 {
 }