svx/source/unodraw/unoshape.cxx | 3 ++- sw/qa/core/data/odt/pass/tdf112017.odt |binary 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 9c781148593b71eaca1798d4415f63d8bc289899 Author: Caolán McNamara <[email protected]> Date: Tue Aug 29 11:43:42 2017 +0100 Resolves: tdf#112017 crash on particular odt Change-Id: I6ba2e73562a16afecb6abdfe4f1a40b1e316379e Reviewed-on: https://gerrit.libreoffice.org/41711 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> 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 new file mode 100644 index 000000000000..02a24d9db146 Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf112017.odt differ
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
