diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-11 20:15:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-12 12:18:28 +0200 |
| commit | 535ce8116f91d14d7f2215786de981f17d875739 (patch) | |
| tree | 6092c0e348fc93462bc9197d70422c91aa47f12a /sc | |
| parent | e203f47774f27e5fc66dc8280643e1955c547eb6 (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/scopetools.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/scopetools.cxx | 13 |
2 files changed, 13 insertions, 2 deletions
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() |