diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-25 00:02:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-25 13:38:34 +0100 |
| commit | 9fba813b5395d89475f7927170517866bdf3a2d6 (patch) | |
| tree | 5a98faaefe972a67c4bea29b530632d2dc5f75dd /svx | |
| parent | 9932cbe1a515420acad07411606be425d31584aa (diff) | |
forcepoint #8 null deref
Change-Id: I29450ab45eba5cccfbfff4744c853e2e70ce679e
Reviewed-on: https://gerrit.libreoffice.org/50291
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 79e7c24296b6..21b770c092d1 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1913,9 +1913,14 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } } - void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) { + if (!mpObj.is()) + { + OSL_FAIL("could not create Custom Shape Defaults!"); + return; + } + static_cast<SdrObjCustomShape*>(mpObj.get())->MergeDefaultAttributes( &rValueType ); } |