diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-29 11:43:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-30 10:11:53 +0200 |
| commit | 9c781148593b71eaca1798d4415f63d8bc289899 (patch) | |
| tree | 20224e47e00ef7a1e50abbf7df6d25b081f79db2 | |
| parent | 7040862125fb1d805286771c26f6b51396cfb145 (diff) | |
Resolves: tdf#112017 crash on particular odt
Change-Id: I6ba2e73562a16afecb6abdfe4f1a40b1e316379e
Reviewed-on: https://gerrit.libreoffice.org/41711
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 3 | ||||
| -rw-r--r-- | sw/qa/core/data/odt/pass/tdf112017.odt | bin | 0 -> 1988 bytes |
2 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 7cc707c7f510..784f4673bff7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3043,7 +3043,8 @@ void SvxShape::setAllPropertiesToDefault() mpObj->SetMergedItem(Svx3DCharacterModeItem(true)); } - mpModel->SetChanged(); + if (mpModel) + mpModel->SetChanged(); } void SvxShape::setPropertiesToDefault( diff --git a/sw/qa/core/data/odt/pass/tdf112017.odt b/sw/qa/core/data/odt/pass/tdf112017.odt Binary files differnew file mode 100644 index 000000000000..02a24d9db146 --- /dev/null +++ b/sw/qa/core/data/odt/pass/tdf112017.odt |