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

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |    5 +----
 sc/source/core/data/table2.cxx                               |    1 +
 sw/source/ui/config/optcomp.cxx                              |    3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 807b68a6f35198f8dee8f57a8925c4cf5ce05ac0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:21:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:33:05 2019 +0200

    cid#14484777 Dereference null return value
    
    Change-Id: If59f06db4a4048f068acc54f9908e45c908138e8
    Reviewed-on: https://gerrit.libreoffice.org/75720
    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/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 2aee672f8ad2..388e0bb1be61 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1663,6 +1663,7 @@ CommentCaptionState ScTable::GetAllNoteCaptionsState(const ScRange& rRange, std:
     bool bFirstControl = true;
 
     ScTable* pTab = pDocument->FetchTable(nTab);
+    assert(pTab);
     const SCCOL nEndCol = pTab->ClampToAllocatedColumns(rRange.aEnd.Col());
     for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
     {
commit de075c0f38a5888b54742b6a95b91d41a443978d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:19:52 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:32:50 2019 +0200

    cid#1448478 Dereference befoew null check
    
    Change-Id: Ia73e6d02d8a8b06012f207820d0d579cfc08c541
    Reviewed-on: https://gerrit.libreoffice.org/75718
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index b52cbfb0d774..35ce20a932fe 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -471,10 +471,7 @@ IMPL_LINK(ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, weld::But
     }
 
     //update color list box
-    if(pInfo)
-    {
-        lcl_selectColor( *m_xLB_LightSource, pInfo->aLightSource.nDiffuseColor );
-    }
+    lcl_selectColor( *m_xLB_LightSource, pInfo->aLightSource.nDiffuseColor );
     updatePreview();
 }
 
commit 71c10fcd14e35cea25641db9c2fd063fd8f8956f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:13:49 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:32:34 2019 +0200

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

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 439fbb8285a6..c400441c6b08 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -105,7 +105,8 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt
     if ( pEntry )
     {
         SvLBoxButton* pButton = static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SvLBoxItemType::Button));
-        if(bChecked)
+        assert(pButton);
+        if (bChecked)
             pButton->SetStateChecked();
         else
             pButton->SetStateUnchecked();