summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-09 10:30:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-09 14:04:25 +0200
commitab2688df8bcf8f1bb3592ebb890028be949066d8 (patch)
treec74b800e2529b289ef3d73c63d0fbe7be6814dae /sfx2
parentd4a70ecf61b016a32caef015eea127d13b357cf7 (diff)
Resolves: tdf#126732 don't abort on IOException, just report
Change-Id: Ia68b6e1e603fbc6397645abdf0ea7131a547ad42 Reviewed-on: https://gerrit.libreoffice.org/77186 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-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 f3ef1c2992a3..45326e225a8f 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2289,6 +2289,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();