core.git: 2 commits - sfx2/source svx/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/sfxbasemodel.cxx                  |    1 +
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9c2b19095819fa941bb6149853d8a94e93dee144
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 2 20:10:53 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Aug 3 12:17:45 2025 +0200

    cid#1659871 silence Dereference null return value
    
    Change-Id: I78cc603ac138ca03f9ba6d2c95d782702486e891
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188859
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 26cab54823ca..1d4547e12da2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2038,6 +2038,7 @@ void SAL_CALL SfxBaseModel::load(   const Sequence< 
beans::PropertyValue >& seqA
     {
         // file recovery: restore original filter
         const SfxStringItem* pFilterItem = 
pMedium->GetItemSet().GetItem(SID_FILTER_NAME, false);
+        assert(pFilterItem && "this will exist");
         SfxFilterMatcher& rMatcher = SfxGetpApp()->GetFilterMatcher();
         std::shared_ptr<const SfxFilter> pSetFilter = 
rMatcher.GetFilter4FilterName( pFilterItem->GetValue() );
         pMedium->SetFilter( pSetFilter );
commit f0ae436a49560dd78686aa4723a8751f083e942b
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 2 20:03:09 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Aug 3 12:17:31 2025 +0200

    cid#1660401 Explicit null dereferenced
    
    Change-Id: I61ffc09df3569119597a97e1eb96dc5096410396
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188858
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 1b8774b62ff8..f506e0124b5a 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -1037,7 +1037,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool 
bDisabled, bool bDefaultOrSet,
 
         if (bDefaultOrSet)
         {
-            if(mpBitmapItem->isPattern())
+            if (mpBitmapItem && mpBitmapItem->isPattern())
                 mxLbFillType->set_active(PATTERN);
             else
                 mxLbFillType->set_active(BITMAP);