summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-07 16:42:58 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-09-20 10:28:21 +0000
commit097f34e6411248856cfc78ffe80571aa2a876bff (patch)
tree985d8166cf6bc14462a9f9bb16a887d1e957d672 /filter
parent2c91b27a968afb36b77e447dd623bbe81ea542f0 (diff)
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 <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/eschesdo.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 1a3e62a54220..b7d4c9024fda 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;
}