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 17:51:32 +0200
commita1d1a629cb985726cb7c4c38bbc166d8fbec14fb (patch)
treec5da2d57707bbb75e7a23d65e5b4f2eaa8c29b31 /sfx2
parent5608074fa6cb1ebfbe8de5189bbe8d74606d088a (diff)
Resolves: tdf#126732 don't abort on IOException, just report
Change-Id: Ia68b6e1e603fbc6397645abdf0ea7131a547ad42 Reviewed-on: https://gerrit.libreoffice.org/77187 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
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 87f308db3a56..359ac6077838 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2298,6 +2298,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();