[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit a1d1a629cb985726cb7c4c38bbc166d8fbec14fb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 9 10:30:51 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 9 17:51:32 2019 +0200

    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 at cib.de>
    Tested-by: Jenkins

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();