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

[Caolán McNamara (via logerrit)]

 sd/source/ui/dlg/tpaction.cxx |    3 ---
 sd/source/ui/inc/tpaction.hxx |    1 -
 sfx2/source/doc/objstor.cxx   |    5 ++++-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 254c8b1cc2a05ac4f2058c8d06eff3c4638b406d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 13 08:47:25 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 13 15:00:33 2024 +0200

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

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 6816b7c29613..efc60481c7e5 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3051,8 +3051,11 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* 
pArgs )
     if (const SfxUnoAnyItem *pItem = 
pRetrMedium->GetItemSet().GetItemIfSet(SID_INTERACTIONHANDLER, false))
     {
         aOriginalInteract = pItem->GetValue();
+#ifndef NDEBUG
         // The original pRetrMedium and potential replacement pMediumTmp have 
the same interaction handler at this point
-        assert(pMediumTmp->GetItemSet().GetItemIfSet(SID_INTERACTIONHANDLER, 
false)->GetValue() == aOriginalInteract);
+        const SfxUnoAnyItem *pMediumItem = 
pMediumTmp->GetItemSet().GetItemIfSet(SID_INTERACTIONHANDLER, false);
+        assert(pMediumItem && pMediumItem->GetValue() == aOriginalInteract);
+#endif
     }
 
     // an interaction handler here can acquire only in case of GUI Saving
commit 5a72adc1c39e4e2765da00475213d193350de84c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 13 08:44:31 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 13 15:00:26 2024 +0200

    cid#1603631 Dereference null return value
    
    pColList is unused anyway, so just remove it
    
    Change-Id: Iac5667d55c78463a0eca2edfa8699dcd87cfc16a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168766
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 3d0f391edc17..5364193d38d1 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -140,9 +140,6 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
         SfxViewFrame* pFrame = pDocSh->GetViewShell()->GetViewFrame();
         m_xLbTree->SetViewFrame( pFrame );
         m_xLbTreeDocument->SetViewFrame( pFrame );
-
-        pColList = pDocSh->GetItem( SID_COLOR_TABLE )->GetColorList();
-        DBG_ASSERT( pColList.is(), "No color table available!" );
     }
     else
     {
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 893192d256f2..596adc20ba7a 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -50,7 +50,6 @@ class SdTPAction final : public SfxTabPage
 private:
     const ::sd::View*       mpView;
     SdDrawDocument*         mpDoc;
-    XColorListRef           pColList;
 
     bool                    bTreeUpdated;
     std::vector<css::presentation::ClickAction> maCurrentActions;