[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit eef750dd5fa3a4160ff9e36228ca885543a5b740
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 9 10:30:51 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 29 09:17:30 2019 +0200

    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 at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/77903
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 59293e3e9cb1..8abd39cc9dec 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2285,6 +2285,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();