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 932a81e9c31a3a5bf5edad3d9e79b111e19b113d
Author: Caolán McNamara <caol...@redhat.com>
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/41712
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
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(
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
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
