diff options
-rw-r--r-- | chart2/source/model/template/CandleStickChartType.hxx | 3 | ||||
-rw-r--r-- | compilerplugins/clang/fragiledestructor.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 00c2747bc7af..969c14c24d35 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -23,7 +23,8 @@ namespace chart { -class CandleStickChartType final : public ChartType +// see tdf#142467 before restoring 'final' +class CandleStickChartType /* final */ : public ChartType { public: explicit CandleStickChartType(); diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx index a1a09a2e6081..9bce19ccda27 100644 --- a/compilerplugins/clang/fragiledestructor.cxx +++ b/compilerplugins/clang/fragiledestructor.cxx @@ -51,6 +51,8 @@ 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 tdf#142467 workaround + return false; return true; } |