chart2/source/tools/ExplicitCategoriesProvider.cxx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
New commits: commit a2dbdee29e0a02401647d2303abc867c55dd12c7 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Thu Nov 28 15:57:25 2024 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Fri Nov 29 12:23:09 2024 +0100 PVS: the 'bDummy' variable was not initialized. This variable is passed by a reference to the 'readArguments' function in which its value will be utilized. Inspect the fifth argument. Change-Id: I39d71ac5e76d3d9a808fa08a430af9aa0686684d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177494 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Tested-by: Jenkins diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index c5e32760f6b3..d543b2b365fb 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -32,6 +32,7 @@ #include <DataSeries.hxx> #include <com/sun/star/chart2/AxisType.hpp> +#include <com/sun/star/chart/ChartDataRowSource.hpp> #include <o3tl/compare.hxx> #include <o3tl/safeint.hxx> #include <rtl/ustrbuf.hxx> @@ -108,11 +109,18 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const rtl::Reference< Ba if( !aSeries.empty() ) { const rtl::Reference< DataSeries >& xSeriesSource = aSeries.front(); - OUString aStringDummy; - bool bDummy; - uno::Sequence< sal_Int32 > aSeqDummy; - DataSourceHelper::readArguments( xDataProvider->detectArguments( xSeriesSource), - aStringDummy, aSeqDummy, bSeriesUsesColumns, bDummy, bDummy ); + for(const auto& rArgument : xDataProvider->detectArguments( xSeriesSource)) + { + if ( rArgument.Name == "DataRowSource" ) + { + css::chart::ChartDataRowSource eRowSource; + if( rArgument.Value >>= eRowSource ) + { + bSeriesUsesColumns = (eRowSource == css::chart::ChartDataRowSource_COLUMNS); + break; + } + } + } } if( bSeriesUsesColumns ) m_aSplitCategoriesList = comphelper::sequenceToContainer<std::vector<Reference<data::XLabeledDataSequence>>>(aColumns);