filter/source/msfilter/eschesdo.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
New commits: commit 097f34e6411248856cfc78ffe80571aa2a876bff Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 7 16:42:58 2016 +0100 Resolves: tdf#99273 can't save specific docx crashtesting: assert on export of tdf99571-1.docx to docx (cherry picked from commit fb045517532aababc06fb4b1112def53b03d9144) Change-Id: I2c8d82ac21451a2d2cc748dc28ac210c8e5ddf5f Reviewed-on: https://gerrit.libreoffice.org/29015 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 1a3e62a..b7d4c90 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1224,8 +1224,17 @@ sal_uInt32 ImplEESdrObject::ImplGetText() { Reference< XText > xXText( mXShape, UNO_QUERY ); mnTextSize = 0; - if( xXText.is() ) - mnTextSize = xXText->getString().getLength(); + if (xXText.is()) + { + try + { + mnTextSize = xXText->getString().getLength(); + } + catch (const uno::RuntimeException& e) + { + SAL_WARN("filter.ms", "ImplGetText exception: " << e.Message); + } + } return mnTextSize; }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits