[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - filter/source

[Caolán McNamara]

 filter/source/msfilter/eschesdo.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit fa5830d02cec81921235357f4ed0372d104cf89e
Author: Caolán McNamara <caolanm at 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/29016
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 4a54dc14..2ba1dde 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;
 }