summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-07 16:42:58 +0100
committerMichael Stahl <mstahl@redhat.com>2016-09-23 13:43:45 +0000
commitfa5830d02cec81921235357f4ed0372d104cf89e (patch)
treec5e36d6ba9888fa69a2037cb1a42dd3d44a555ae
parentdafcb32f09c3acea8e2fa12e1d39261b13c740db (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/29016 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-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 4a54dc144a53..2ba1dde8acdd 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -1230,8 +1230,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;
}