[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/drviews7.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit abfaa0e504ef823c9befc90216651522c3fa3a1d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 9 10:19:36 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 9 17:14:09 2020 +0200

    cid#1448269 Dereference null return value
    
    Change-Id: I9644d5e3845533fe8117f152c047cc381b3b2c48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98417
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 104d6f23801a..9f7dd8d417d3 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1712,8 +1712,9 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
     switch (eXFS)
     {
         case drawing::FillStyle_SOLID:
+        if (const XFillColorItem* pColorItem = rPageAttr.GetItem(XATTR_FILLCOLOR))
         {
-            Color aColor =  rPageAttr.GetItem( XATTR_FILLCOLOR )->GetColorValue();
+            Color aColor = pColorItem->GetColorValue();
             XFillColorItem aFillColorItem( OUString(), aColor );
             aFillColorItem.SetWhich( SID_ATTR_PAGE_COLOR );
             rSet.Put( aFillColorItem );