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

[Miklos Vajna (via logerrit)]

 svx/source/unodraw/unoshap2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 99adff0b97c01d5f50e8c622396f574e2eb9e71c
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Mar 2 08:19:39 2022 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Mar 3 08:10:14 2022 +0100

    svx: the SdrObject of SvxGraphicObject can be nullptr
    
    Crashreport:
    
            Graphic::GetType() const
                    vcl/inc/impgraph.hxx:122
            SvxGraphicObject::getPropertyValueImpl(rtl::OUString const&, 
SfxItemPropertySimpleEntry const*, com::sun::star::uno::Any&)
                    svx/source/unodraw/unoshap2.cxx:1466 (discriminator 1)
            SvxShape::_getPropertyValue(rtl::OUString const&)
                    svx/source/unodraw/unoshape.cxx:1747
            non-virtual thunk to SvxShape::getPropertyValue(rtl::OUString 
const&)
                    svx/source/unodraw/unoshape.cxx:1732
    
    During SVG export of a selected shape.
    
    Change-Id: I29b56d49b0c5418dfe8fec8491ac8667e5ade2ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130740
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130819
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit c1ce7d9f2c4036ae71f8cfa71e4bee4067f4d8d2)

diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 415ddf95eeb9..839094c6d556 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1461,7 +1461,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const 
OUString& rName, const SfxIte
 
         Reference<graphic::XGraphic> xGraphic;
         auto pSdrGraphicObject = static_cast<SdrGrafObj*>(GetSdrObject());
-        if (pSdrGraphicObject->GetGraphicObject().GetType() != 
GraphicType::NONE)
+        if (pSdrGraphicObject
+            && pSdrGraphicObject->GetGraphicObject().GetType() != 
GraphicType::NONE)
             xGraphic = pSdrGraphicObject->GetGraphic().GetXGraphic();
         rValue <<= xGraphic;
         break;