[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/source

[Michael Stahl (via logerrit)]

 svx/source/sdr/properties/defaultproperties.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ecfa3da07e5b68a4bc24f25d3760e72efc42fe92
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Apr 16 16:21:26 2021 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 21 20:53:37 2021 +0200

    svx: fix crash in DefaultProperties::dumpAsXml()
    
    mpItemSet can be null
    
    Change-Id: I4192f84639116c550bba5303a5fc70528cb3e8c3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114263
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit 832b23d9376019619929764606276aacde1e329a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114268
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index e9a9934a9973..9244356af297 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -246,7 +246,10 @@ namespace sdr::properties
         {
             xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
             BaseProperties::dumpAsXml(pWriter);
-            mpItemSet->dumpAsXml(pWriter);
+            if (mpItemSet)
+            {
+                mpItemSet->dumpAsXml(pWriter);
+            }
             xmlTextWriterEndElement(pWriter);
         }
 } // end of namespace