[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/doc/objstor.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit f3ba1e9f8fddbb50f58fdccdeaea62e0d6f468a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 24 10:45:49 2017 +0000

    rtfrow-crash.rtf throws a o3tl::divide_by_zero
    
    from writerfilter/source/dmapper/DomainMapperTableManager.cxx
    
    Change-Id: I69fca8376166850cdedbc7c2b3908d7336e8bed9

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 1bf7099..b80e551 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2292,6 +2292,13 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
                     e.Message, ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError ), "");
             }
         }
+        catch (const std::exception& e)
+        {
+            const char *msg = e.what();
+            OUString sError(msg, strlen(msg), RTL_TEXTENCODING_ASCII_US);
+            SetError(*new StringErrorInfo(ERRCODE_SFX_DOLOADFAILED,
+                sError, ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageError), "");
+        }
         catch (...)
         {
             std::abort(); // cannot happen