[Libreoffice-commits] core.git: 3 commits - bean/com sc/source vcl/source

[Caolán McNamara (via logerrit)]

 bean/com/sun/star/comp/beans/OOoBean.java   |    6 +++++-
 sc/source/filter/excel/xistring.cxx         |    2 +-
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 46920005f74edcb70acfb8dd1a0ffb9553e5c2b2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Nov 16 17:22:22 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 16 20:25:07 2019 +0100

    cid#1448516 silence Dereference null return value
    
    Change-Id: Ifb7e14183e97c225ed7e68f93e6142d10c4a87b0
    Reviewed-on: https://gerrit.libreoffice.org/82991
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 0345d48ca45e..3475447368e4 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -291,12 +291,16 @@ public class OOoBean
             // avoid concurrent access from multiple threads
             final OfficeConnection iConn = getOOoConnection();
 
+            com.sun.star.uno.XComponentContext xComponentContext = iConn.getComponentContext();
+            if (xComponentContext == null)
+                throw new NoConnectionException();
+
             Thread aConnectorThread = new Thread("getServiceManager") {
                 @Override
                 public void run()
                 {
                     com.sun.star.lang.XMultiComponentFactory aFactory =
-                        iConn.getComponentContext().getServiceManager();
+                        xComponentContext.getServiceManager();
                     xServiceFactory = UnoRuntime.queryInterface(
                         com.sun.star.lang.XMultiServiceFactory.class, aFactory );
                 }
commit 9aab980711f82471b012b1691699d9a28ef836f5
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Nov 16 11:01:38 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sat Nov 16 20:25:02 2019 +0100

    widget theme: allow for default "stacked" spinbuttons
    
    Change-Id: I2943616a641de72a615f57784e8a9927c12edcf7
    Reviewed-on: https://gerrit.libreoffice.org/82979
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 0eb0484d4cbe..3d650719eb79 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -737,9 +737,14 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 
             auto const& pEntirePart
                 = m_pWidgetDefinition->getDefinition(eType, ControlPart::Entire);
+
             OString sOrientation = pEntirePart->msOrientation;
 
-            if (sOrientation.isEmpty() || sOrientation == "decrease-edit-increase")
+            if (sOrientation.isEmpty() || sOrientation == "stacked")
+            {
+                return false;
+            }
+            else if (sOrientation == "decrease-edit-increase")
             {
                 if (ePart == ControlPart::ButtonUp)
                 {
commit d6f00ac943fbcdc56e828db0c9ff96337c1e74f7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Nov 16 17:44:17 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 16 20:24:51 2019 +0100

    cid#1448453 Untrusted value as argument
    
    coverity doesn't warn about XclImpString::ReadFormats
    
    Change-Id: Ide6285f39fed09a1767c2a2272f30ec213a20106
    Reviewed-on: https://gerrit.libreoffice.org/82993
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index 4b06f3447978..096507ba8351 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -80,7 +80,7 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
             maString = rStrm.ReadRawUniString( nChars, b16Bit );
 
             // --- formatting ---
-            if( nRunCount > 0 )
+            if (nRunCount)
                 ReadFormats( rStrm, maFormats, nRunCount );
 
             // --- extended (FarEast) information ---