[Libreoffice-commits] core.git: 2 commits - chart2/source libreofficekit/qa

[Caolán McNamara (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |    6 +++---
 libreofficekit/qa/tilebench/tilebench.cxx                   |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d31f61f47293b1ea9b9d86def4a412c3c45797b5
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 1 13:18:22 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 1 15:32:37 2023 +0200

    cid#1533667 silence Uninitialized scalar variable
    
    Change-Id: I6121ed3f9a316172423c9ffc2104510498a58d04
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153823
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index 3464c589f542..ffcdcefa009f 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -133,6 +133,9 @@ static void dumpTile(const char *pNameStem,
                         buf[1] = (*(pixel + 1) * 255 + alpha / 2) / alpha;
                         buf[2] = (*(pixel + 0) * 255 + alpha / 2) / alpha;
                         break;
+                    default:
+                        assert(false && "unhandled LibreOfficeKitTileMode");
+                        break;
                 }
             }
 
commit 92ec5c70691778ccff8a37be361e638379ee6b4d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 1 12:50:03 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 1 15:32:30 2023 +0200

    cid#1500458 help coverity see that Dereference after null check is false
    
    Change-Id: Ieb61797fa230d4b7d7650cfcb8b7c988bf292189
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153822
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 98468a138c3f..5317c1c47c06 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -678,9 +678,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
     m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable;
     m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
     m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
-    m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
-    m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] =
-        m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] && 
m_apControllerState->bMayAddR2Value;
+    const bool bInsertTrendlineEquation = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
+    m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = 
bInsertTrendlineEquation;
+    m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = 
bInsertTrendlineEquation && m_apControllerState->bMayAddR2Value;
     m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value
         && !m_apControllerState->bMayAddTrendlineEquation;
     m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;