diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-15 13:49:20 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-10 22:11:07 +0200 |
| commit | 4b3760b3c535fcb5e596cf4fd50f3924523689b5 (patch) | |
| tree | 2d991865926af75464d31374d50d3183b2ee1aa2 /svx/source | |
| parent | f9eda88435919ef9d407d93c9ebba651f10d8edf (diff) | |
Resolves: rhbz#1104068 crash converting fontwork to curve
via metafile, i.e. take fontwork example 11, convert
to metafile and convert that to curve
was coverity#1019335 Dereference after null check
(cherry picked from commit d77cc9d2cdc702f2b2016498df107f4120d27690)
Change-Id: I309e0c3f8a0630991e2aad64f995567e0920be3b
Reviewed-on: https://gerrit.libreoffice.org/9649
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 0a672d304e6b..044697706228 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1011,7 +1011,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) ImpLinkAbmeldung(); } - if(!pModel && !GetStyleSheet() && pNewPage->GetModel()) + if(!pModel && !GetStyleSheet() && pNewPage && pNewPage->GetModel()) { // #i119287# Set default StyleSheet for SdrGrafObj here, it is different from 'Default'. This // needs to be done before the style 'Default' is set from the :SetModel() call which is triggered |