helpcontent2 | 2 +-
sfx2/source/doc/objstor.cxx | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 6daaa1f1f7e675c142fb497711f907ccdcab2a8e
Author: Vipul Gupta <vipul.gupta73...@gmail.com>
AuthorDate: Thu Aug 8 23:04:04 2019 -0300
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Fri Aug 9 14:04:37 2019 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
- tdf#76535 Clarify hyperlink button edition.
Change-Id: I268cfd36f15bea462265b2f3d28488f873cfb662
Signed-off-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/77197
Tested-by: Jenkins
diff --git a/helpcontent2 b/helpcontent2
index 3b0bcc8984e2..08299df834e7 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3b0bcc8984e252917dcb9a17c7e7755834749935
+Subproject commit 08299df834e707281b3fc444ddd2e779ffcfcf82
commit ab2688df8bcf8f1bb3592ebb890028be949066d8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 9 10:30:51 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 9 14:04:25 2019 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
