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

[Caolán McNamara (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e63ad6a1363a8bd0c40e8a84073c2f6b22f1e953
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 24 09:57:43 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 24 13:06:58 2022 +0100

    cid#1500434 Dereference after null check
    
    Change-Id: I10d7c70c40a41301752854b898d8d763ec6d6b72
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130485
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 33649bfd7a1f..b957d9a0f35b 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -641,7 +641,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 
     // text
     m_aCommandAvailability[ ".uno:ScaleText" ] = bIsWritable && 
bModelStateIsValid ;
-    m_aCommandArguments[ ".uno:ScaleText" ] <<= 
m_apModelState->bHasAutoScaledText;
+    m_aCommandArguments[ ".uno:ScaleText" ] <<= bModelStateIsValid && 
m_apModelState->bHasAutoScaledText;
 
     // axes
     m_aCommandAvailability[ ".uno:DiagramAxisX" ] = bIsWritable && 
bModelStateIsValid && m_apModelState->bHasXAxis;