| commit | 90d22daf99e3d07ba19b7d16f240ab53b0873d49 | [log] |
|---|---|---|
| author | Kevin Suo <suokunlong@126.com> | Thu Feb 15 23:16:50 2024 +0800 |
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | Fri Feb 16 10:11:29 2024 +0100 |
| tree | bdce99ede08475c29c92901b1500df2f087ae0a6 | |
| parent | f25b7efba56757b085f7a836f57d9c2fc8fd14b8 [diff] |
tdf#142467: restore "final" in CandleStickChartType class The "final" was removed in commit e06f2bb00137655dbf6f0a8c8c2fc555720f4d3f (tdf#142467 crash on calling 'getInfoHelper' in final class, 2021-05-26) and commit 6cb1745c24c7651050e30216860c539fa13cc0e2 (tdf#142467: Update comments with GCC bug ID, 2021-05-31) due to a bug in gcc <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100797>. Now it has been amost 3 years past and that gcc bug has long been fixed, so it is time to restore the "final". Change-Id: I7db9fe59209cfbae4c04bb3a91cd764db9a38d98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163447 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index e761075..822422a 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -23,9 +23,7 @@ namespace chart { // see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100797> "[10/11/12 Regression] using // declaration causing virtual call with wrongly adjusted this pointer" before restoring 'final' class CandleStickChartType /* final */ : public ChartType class CandleStickChartType final : public ChartType { public: explicit CandleStickChartType();
diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx index f8ec76a..7777100 100644 --- a/compilerplugins/clang/fragiledestructor.cxx +++ b/compilerplugins/clang/fragiledestructor.cxx
@@ -51,8 +51,6 @@ public: return false; if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/layout/ssfrm.cxx")) // ~SwFrame calling IsDeleteForbidden return false; if (loplugin::isSamePathname(fn, SRCDIR "/chart2/source/model/template/CandleStickChartType.cxx")) // to ignore <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100797> "[10/11/12 Regression] using declaration causing virtual call with wrongly adjusted this pointer" workaround return false; return true; }