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

[Caolán McNamara]

 sc/source/filter/orcus/interface.cxx |    8 ++++++--
 sw/source/uibase/shells/basesh.cxx   |    3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit dce1b34a62ad204f995f626064ccf6b71e59c9f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 22 09:48:59 2017 +0000

    coverity#1426874 bogus Dereference after null check
    
    Change-Id: Icb3ad60a7ec314182e06af179d9d5c3a1f3babcb

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 173c8d69d372..7428455dfb7b 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2260,7 +2260,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
     const SfxItemSet* pArgs = rReq.GetArgs();
     sal_uInt16 nSlot(rReq.GetSlot());
 
-    if(!pArgs  && nSlot != SID_BACKGROUND_COLOR)
+    if (!pArgs && nSlot != SID_BACKGROUND_COLOR)
     {
         return;
     }
@@ -2314,6 +2314,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         case SID_ATTR_BRUSH:
         case RES_BACKGROUND:
         {
+            assert(pArgs && "only SID_BACKGROUND_COLOR can have !pArgs, checked at entry");
             const SvxBrushItem& rNewBrushItem = static_cast<const SvxBrushItem&>(pArgs->Get(GetPool().GetWhich(nSlot)));
             aBrushItem = rNewBrushItem;
             break;
commit 02b9ada327c862ce79b5d4e4bbd4370d615b0e0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 22 09:44:05 2017 +0000

    coverity#1426736 Uninitialized scalar field
    
    Change-Id: I6fbf7004cea04c61f89f3a720a24c9ee82f4b117

diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index e3a82305f90c..e40a71b446cb 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -87,8 +87,12 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
 
 }
 
-ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc) :
-    mrDoc(rDoc), meOrcusGrammar(os::formula_grammar_t::unknown) {}
+ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc)
+    : mrDoc(rDoc)
+    , meCalcGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
+    , meOrcusGrammar(os::formula_grammar_t::unknown)
+{
+}
 
 void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
 {