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

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/chart/objectformatter.cxx |    2 +-
 svx/source/form/filtnav.cxx                    |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c118de71bf9be88ab1045621116e04bf0d1e084f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 21 12:25:07 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Feb 21 16:21:01 2022 +0100

    cid#1500564 Dereference null return value
    
    Change-Id: Ia3e0521a013c3226f2fd5fdfef4e67dc1d5a0374
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130276
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 66c70522cf16..5f73b825f331 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1239,8 +1239,11 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const 
ExecuteDropEvent& rEvt )
     FmFilterItems* pTargetItems = getTargetItems(*m_xTreeView, *xDropTarget);
     m_xTreeView->unselect_all();
     std::unique_ptr<weld::TreeIter> xEntry = FindEntry(pTargetItems);
-    m_xTreeView->select(*xEntry);
-    m_xTreeView->set_cursor(*xEntry);
+    if (xEntry)
+    {
+        m_xTreeView->select(*xEntry);
+        m_xTreeView->set_cursor(*xEntry);
+    }
 
     
insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY
 == rEvt.mnAction);
 
commit b55eca694b3cf4bcaec59512709c705fe4c25943
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 21 12:22:56 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Feb 21 16:20:48 2022 +0100

    cid#1500563 silence Explicit null dereferenced
    
    probably silences it, an experiment
    
    Change-Id: I4bae3fb1d8907e6e02fa5e68a6fdb66e53e4f7b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130275
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index d02a8d8644e2..07b8682974f8 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -873,7 +873,7 @@ void FillFormatter::convertFormatting( ShapePropertyMap& 
rPropMap, const ModelRe
     FillProperties aFillProps;
     if( mxAutoFill )
         aFillProps.assignUsed( *mxAutoFill );
-    if( rxShapeProp.is() )
+    if (rxShapeProp)
         aFillProps.assignUsed( rxShapeProp->getFillProperties() );
     if( pPicOptions )
         lclConvertPictureOptions( aFillProps, *pPicOptions );