[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/theme/ThemeColorChangerCommon.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6d2633b37dabfad4ea1ea82041f8ae60a56cafd8
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 31 09:03:31 2023 +0100
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 31 18:31:31 2023 +0200

    cid#1542447 Explicit null dereferenced
    
    Change-Id: I1de10a8a459175f79bb2b8f796cde287be1945c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156228
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/svx/source/theme/ThemeColorChangerCommon.cxx 
b/svx/source/theme/ThemeColorChangerCommon.cxx
index 29d65cdda960..fab4835684a1 100644
--- a/svx/source/theme/ThemeColorChangerCommon.cxx
+++ b/svx/source/theme/ThemeColorChangerCommon.cxx
@@ -49,16 +49,16 @@ const SvxColorItem* getColorItem(const editeng::Section& 
rSection)
     return nullptr;
 }
 
-bool updateEditEngTextSections(model::ColorSet const& rColorSet, SdrObject* 
pObject, SdrView* pView)
+bool updateEditEngTextSections(model::ColorSet const& rColorSet, SdrObject* 
pObject, SdrView& rView)
 {
     SdrTextObj* pTextObject = DynCastSdrTextObj(pObject);
 
     if (!pTextObject)
         return false;
 
-    pView->SdrBeginTextEdit(pTextObject);
+    rView.SdrBeginTextEdit(pTextObject);
 
-    auto* pOutlinerView = pView->GetTextEditOutlinerView();
+    auto* pOutlinerView = rView.GetTextEditOutlinerView();
     if (!pOutlinerView)
         return false;
 
@@ -97,7 +97,7 @@ bool updateEditEngTextSections(model::ColorSet const& 
rColorSet, SdrObject* pObj
         }
     }
 
-    pView->SdrEndTextEdit();
+    rView.SdrEndTextEdit();
 
     return true;
 }
@@ -166,7 +166,8 @@ void updateSdrObject(model::ColorSet const& rColorSet, 
SdrObject* pObject, SdrVi
     if (!pObject)
         return;
 
-    updateEditEngTextSections(rColorSet, pObject, pView);
+    if (pView)
+        updateEditEngTextSections(rColorSet, pObject, *pView);
     updateObjectAttributes(rColorSet, *pObject, pUndoManager);
 }