summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-29 11:43:42 +0100
committerAndras Timar <andras.timar@collabora.com>2017-09-01 16:17:24 +0200
commitb7df772e5d32d930927605d6e02a35d9e60bc6dd (patch)
treea074b5bc9143c85e43dc59b98e5bc1f83937b496 /svx
parent63e158c66edf74d320fd05197779429efc964955 (diff)
Resolves: tdf#112017 crash on particular odt
Change-Id: I6ba2e73562a16afecb6abdfe4f1a40b1e316379e Reviewed-on: https://gerrit.libreoffice.org/41712 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 932a81e9c31a3a5bf5edad3d9e79b111e19b113d)
Diffstat (limited to 'svx')
-rw-r--r--svx/source/unodraw/unoshape.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index a93e1eb3b973..76d0dd22a97f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3069,7 +3069,8 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::ex
mpObj->SetMergedItem(Svx3DCharacterModeItem(true));
}
- mpModel->SetChanged();
+ if (mpModel)
+ mpModel->SetChanged();
}
void SvxShape::setPropertiesToDefault(