summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-09 10:30:51 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-09 17:11:27 +0200
commit4cce3278dd3f4f882e622aaf0d219063cbae9767 (patch)
treeaac8c3afd6722ef5611ae43188de73965757aea0
parent54e4d3b0983698ba8588146299b5db59e946cfc4 (diff)
Resolves: tdf#126732 don't abort on IOException, just report
Change-Id: Ia68b6e1e603fbc6397645abdf0ea7131a547ad42 Reviewed-on: https://gerrit.libreoffice.org/77188 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r--sfx2/source/doc/objstor.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index f1ae5b009231..bc6eb96a94bf 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2279,6 +2279,11 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
e.Message, DialogMask::ButtonsOk | DialogMask::MessageError ));
}
}
+ catch (const css::io::IOException& e)
+ {
+ SetError(*new StringErrorInfo(ERRCODE_SFX_FORMAT_ROWCOL,
+ e.Message, DialogMask::ButtonsOk | DialogMask::MessageError ));
+ }
catch (const std::exception& e)
{
const char *msg = e.what();