[Libreoffice-commits] core.git: 5 commits - filter/source libreofficekit/source qadevOOo/tests svx/source

[Caolán McNamara]

 filter/source/msfilter/eschesdo.cxx                 |    1 +
 libreofficekit/source/gtk/tilebuffer.hxx            |    4 ++++
 qadevOOo/tests/java/ifc/chart/_XChartDataArray.java |    8 ++++++--
 svx/source/form/filtnav.cxx                         |    6 ++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 45f39af2b72fa7455bb94a92ec51c4aa9e26ae2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 21 09:17:14 2015 +0000

    coverity#735862 Unchecked dynamic_cast
    
    Change-Id: I8f518ed428c8c13dc411174f468a09565ad50f37

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 2f413e6..2e4bf31 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -782,8 +782,10 @@ void FmFilterModel::Remove(FmFilterData* pData)
                 while ( !rChildren.empty() )
                 {
                     ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1;
-                    FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( *removePos  );
-                    FmFilterAdapter::setText( nPos, pFilterItem, OUString() );
+                    if (FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( *removePos))
+                    {
+                        FmFilterAdapter::setText( nPos, pFilterItem, OUString() );
+                    }
                     Remove( removePos );
                 }
             }
commit 92305c3c41d120b868e0821221a583697868ad6d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 21 09:11:16 2015 +0000

    coverity#1315075 Uninitialized scalar field
    
    Change-Id: I003839589354f02f8064b6a6af6174d2793b9b3a

diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
index 70784a5..64491ee 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -266,6 +266,10 @@ struct LOEvent
         , m_nSetGraphicSelectionType(0)
         , m_nSetGraphicSelectionX(0)
         , m_nSetGraphicSelectionY(0)
+        , m_nTilePixelWidth(0)
+        , m_nTilePixelHeight(0)
+        , m_nTileTwipWidth(0)
+        , m_nTileTwipHeight(0)
     {
     }
 
commit c44ee23cf13f40e36bae0454cceb06a7d986a6bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 21 09:09:36 2015 +0000

    coverity#707837 Uninitialized scalar field
    
    Change-Id: I1eb85e5f5c98f0f2a41a4711d9d77174ab07587d

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index c011ec3..7585582 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -68,6 +68,7 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
     , mpPicStrm(nullptr)
     , mpHostAppData(nullptr)
     , mnPagesWritten(0)
+    , mnShapeMasterBody(0)
     , mnIndices(0)
     , mnOutlinerCount(0)
     , mnStatMaxValue(0)
commit 91fde32383c94e8840e4e8fab8f47be83d23d20c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 21 09:07:05 2015 +0000

    coverity#1326924 NS: Suspicious use of non-short-circuit boolean operator
    
    Change-Id: I2450cdd6e74e1ebab13c61f3a88668df412f6a61

diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
index 06296ef..5021657 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
@@ -166,7 +166,9 @@ public class _XChartDataArray extends MultiMethodTest {
         if (bResult) {
             for (int i = 0; i < dscs.length; i++) {
                 log.println("Col " + i + ": got " + dscs[i] + " expected: " + colDscs[i]);
-                bResult &= dscs[i].equals(colDscs[i]);
+                if (!dscs[i].equals(colDscs[i])) {
+                    bResult = false;
+                }
             }
         }
 
commit 72f9ee58e88fbd94252faa3e1e6a4f7fd7517f49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 21 09:06:33 2015 +0000

    coverity#1326926 NS: Suspicious use of non-short-circuit boolean operator
    
    Change-Id: I16c0d0b19290d59089a11eb660aa23fa8b03535c

diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
index cd84569..06296ef 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
@@ -190,7 +190,9 @@ public class _XChartDataArray extends MultiMethodTest {
         if (bResult) {
             for (int i = 0; i < dscs.length; i++) {
                 log.println("Row " + i + ": got " + dscs[i] + " expected: " + rowDscs[i]);
-                bResult &= dscs[i].equals(rowDscs[i]);
+                if (!dscs[i].equals(rowDscs[i])) {
+                    bResult = false;
+                }
             }
         }