sc/inc/scopetools.hxx | 2 +- sc/source/core/tool/scopetools.cxx | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
New commits: commit 535ce8116f91d14d7f2215786de981f17d875739 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 11 20:15:06 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 12 12:18:28 2020 +0200 cid#1465256 silence Uncaught exception Change-Id: I1356f311b8eb71549ab9570ae7e568f52c301070 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98581 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx index d87cb9b04ad6..eb2941f15777 100644 --- a/sc/inc/scopetools.hxx +++ b/sc/inc/scopetools.hxx @@ -83,7 +83,7 @@ public: DelayStartListeningFormulaCells(ScColumn& column, bool delay); DelayStartListeningFormulaCells(ScColumn& column); DelayStartListeningFormulaCells(const DelayStartListeningFormulaCells&) = delete; - ~DelayStartListeningFormulaCells() COVERITY_NOEXCEPT_FALSE; + ~DelayStartListeningFormulaCells(); void set(); }; diff --git a/sc/source/core/tool/scopetools.cxx b/sc/source/core/tool/scopetools.cxx index 541ec3e3c3ea..cbe0486ad0c8 100644 --- a/sc/source/core/tool/scopetools.cxx +++ b/sc/source/core/tool/scopetools.cxx @@ -85,9 +85,20 @@ DelayStartListeningFormulaCells::DelayStartListeningFormulaCells(ScColumn& colum { } -DelayStartListeningFormulaCells::~DelayStartListeningFormulaCells() COVERITY_NOEXCEPT_FALSE +DelayStartListeningFormulaCells::~DelayStartListeningFormulaCells() { +#if defined(__COVERITY__) + try + { + mColumn.GetDoc()->EnableDelayStartListeningFormulaCells(&mColumn, mbOldValue); + } + catch (...) + { + std::abort(); + } +#else mColumn.GetDoc()->EnableDelayStartListeningFormulaCells(&mColumn, mbOldValue); +#endif } void DelayStartListeningFormulaCells::set() _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
