summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-15 13:49:20 +0000
committerMichael Stahl <mstahl@redhat.com>2014-06-05 22:00:24 +0000
commitec98e41a4ad88ce7c9a76f1e0a35157e10a48213 (patch)
tree590853be322d7b6fecec3d71a90475c705a43a08 /svx
parentece49b68c408edea1ebcb8149c41051d5bdac279 (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')
-rw-r--r--svx/source/svdraw/svdograf.cxx2
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