summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-24 10:45:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-02-24 10:53:59 +0000
commitf3ba1e9f8fddbb50f58fdccdeaea62e0d6f468a2 (patch)
tree897d0adc9d4cd0374b4c2bcf99730a41032353ea /sfx2
parente146741ec96292ef092c6eebfd7fe18fa5ca3cc0 (diff)
rtfrow-crash.rtf throws a o3tl::divide_by_zero
from writerfilter/source/dmapper/DomainMapperTableManager.cxx Change-Id: I69fca8376166850cdedbc7c2b3908d7336e8bed9
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objstor.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 1bf7099e496c..b80e55125732 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