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

[Caolán McNamara]

 sc/source/core/data/attrib.cxx |    5 ++++-
 sc/source/core/data/global.cxx |    3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 29bb9775ce5443d5f4929471fa2cd85d8e6d6c45
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Jul 23 19:33:36 2017 +0100

    coverity#1415620 Unchecked return value (golden)
    
    Change-Id: I5229a29d6f2017abe32121cbdedbba1017cc4a46

diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index f3018ef88262..157ee78ea1ab 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -871,7 +871,10 @@ bool ScViewObjectModeItem::GetPresentation
             }
             SAL_FALLTHROUGH;
         case SfxItemPresentation::Nameless:
-            rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue());
+            if (GetValue() == VOBJ_MODE_SHOW)
+                rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW);
+            else
+                rText += ScGlobal::GetRscString(STR_VOBJ_MODE_HIDE);
             return true;
             break;
 
commit d3cc241f9078e894d27575f9025cb07c482185e7
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Jul 23 19:29:04 2017 +0100

    coverity#1415619 Explicit null dereferenced
    
    Change-Id: Ibf0419ab8bd288c2f83c2dfcf5598c0da7eca307

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index ce644d04486c..34398fe41760 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -356,8 +356,7 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
     switch (nErr)
     {
         case FormulaError::NONE:
-            pErrNumber = nullptr;
-            break;
+            return OUString();
         case FormulaError::IllegalArgument:
             pErrNumber = STR_LONG_ERR_ILL_ARG;
         break;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits