sc/inc/column.hxx | 4 ++-- sc/source/core/data/column.cxx | 4 ++-- sc/source/core/data/column3.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 74ffed183b404a73a88cca9a8a01232d40134dcd Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 29 12:23:55 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 29 19:47:41 2025 +0100 cid#1399153 Uncaught exception Change-Id: I4c8e1f1225a41d8c8d1671d609b807cd16ec0ee0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194819 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index b11b6cf3917e..9898a30be1e4 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -245,7 +245,7 @@ public: }; ScColumn(ScSheetLimits const &); - ~ScColumn() COVERITY_NOEXCEPT_FALSE; + ~ScColumn(); void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument& rDoc, bool bEmptyAttrArray); @@ -271,7 +271,7 @@ public: void Delete( SCROW nRow ); void DeleteContent( SCROW nRow, bool bBroadcast = true ); - void FreeAll(); + void ImplDestroy(); void FreeNotes(); void Swap( ScColumn& rOther, SCROW nRow1, SCROW nRow2, bool bPattern ); diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 7dc26e9409b0..ae6f285ca87c 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -95,9 +95,9 @@ ScColumn::ScColumn(ScSheetLimits const & rSheetLimits) : maCells.resize(rSheetLimits.GetMaxRowCount()); } -ScColumn::~ScColumn() COVERITY_NOEXCEPT_FALSE +ScColumn::~ScColumn() { - FreeAll(); + suppress_fun_call_w_exception(ImplDestroy()); } void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument& rDoc, bool bEmptyAttrArray) diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index a50226db8415..4fb7786879fa 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -232,7 +232,7 @@ void ScColumn::Delete( SCROW nRow ) CellStorageModified(); } -void ScColumn::FreeAll() +void ScColumn::ImplDestroy() { maCells.event_handler().stop(); maCellNotes.event_handler().stop();
