diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-03-01 08:34:32 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2022-03-01 10:03:16 +0100 |
| commit | 8311a2716924ad0bac7fc0a9e75279382a9553b0 (patch) | |
| tree | 371b49a48db69e52f67820409f57c01e9fa39115 | |
| parent | Bump version to 21.06.18.1 (diff) | |
| download | core-8311a2716924ad0bac7fc0a9e75279382a9553b0.tar.gz core-8311a2716924ad0bac7fc0a9e75279382a9553b0.zip | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 1ff2d3e03e9d..216605ebfa03 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1463,7 +1463,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; |