diff options
| -rw-r--r-- | chart2/source/model/template/CandleStickChartType.hxx | 4 | ||||
| -rw-r--r-- | compilerplugins/clang/fragiledestructor.cxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index e7610750758f..822422aac85f 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 f8ec76a561f8..777710056684 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; } |