From 3b7c754dd83a8c9e887b7092aa10b0ff7041462d Mon Sep 17 00:00:00 2001 From: Ouyang Leyan Date: Sun, 16 Jan 2022 12:25:58 +0100 Subject: tdf#146463 Apply data series filter to the chart legend Consider a data series as hidden if there is no unfiltered value, do not consider data labels. It solves a regression introduced when working on tdf#134059. Change-Id: I6072bf469137d70e0aa353ffbeb0d0a1216ffa5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128476 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 7c5cfe54357e4e8d08b4696e80741097d3335dcb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130645 Reviewed-by: Xisco Fauli (cherry picked from commit 73e443d32d5c275da953c29f4c493ff565426e8d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130671 --- chart2/source/tools/DataSeriesHelper.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 9f17273c1607..2c96c9b16b28 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -671,8 +671,6 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries ) continue; if( lcl_SequenceHasUnhiddenData( aDataSequences[nN]->getValues() ) ) return true; - if( lcl_SequenceHasUnhiddenData( aDataSequences[nN]->getLabel() ) ) - return true; } return false; } -- cgit