[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests swext/mediawiki

[Caolán McNamara]

 qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java |   13 ++--------
 swext/mediawiki/src/com/sun/star/wiki/Helper.java             |    2 -
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit d385fd6c96b3401df07b66743ce68a2f47b0d13f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 6 21:11:56 2016 +0000

    coverity#1326247 Explicit null dereferenced
    
    Change-Id: I88a88f3705365854506a946039df44fb87134844

diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
index 3f08e3e..42324fd 100644
--- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
@@ -162,15 +162,8 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest {
     public void _setPropertyValuesTolerant() {
         requiredMethod("getPropertyValuesTolerant()");
 
-        SetPropertyTolerantFailed[] SPTF = null;
-
-        try {
-            SPTF = oObj.setPropertyValuesTolerant(namesOfProperties,
-                                                  getNewValues(
-                                                          valuesOfProperties));
-        } catch (com.sun.star.lang.IllegalArgumentException e) {
-            e.printStackTrace(log);
-        }
+        SetPropertyTolerantFailed[] SPTF = oObj.setPropertyValuesTolerant(namesOfProperties,
+                                                  getNewValues(valuesOfProperties));
 
         //read only properties will throw a PropertyVetoExeption if they are set
         int failures = 0;
@@ -334,4 +327,4 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest {
 
         return newValues;
     }
-}
\ No newline at end of file
+}
commit f0b3d214338b677cfd6a100a2aa9d92570930d3c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 6 21:09:13 2016 +0000

    coverity#1326198 Dereference after null check
    
    Change-Id: I3db353d04094ba47fe915ea5dc4d96fc4612cc68

diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 8b781cc..bde53b3 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -191,7 +191,7 @@ public class Helper
             }
         }
 
-        return m_bShowInBrowser.booleanValue();
+        return m_bShowInBrowser != null ? m_bShowInBrowser.booleanValue() : false;
     }
 
     synchronized protected static void SetShowInBrowserByDefault( XComponentContext xContext, boolean bValue )