chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 2 +- chart2/source/inc/InternalDataProvider.hxx | 3 +-- chart2/source/model/main/ChartModel.cxx | 4 ++-- chart2/source/tools/InternalDataProvider.cxx | 9 ++++----- 4 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit 8d5a6870a77b55d53172154ba04a2d111accda1b Author: Noel Grandin <[email protected]> AuthorDate: Mon Mar 2 15:09:40 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Mar 3 07:58:19 2026 +0100 InternalDataProvider constructor always has bDefaultDataInColumns == true Change-Id: I93c64a310852f1b823327874d9cc487c653c6222 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200860 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 948af8281f44..ce649903f83e 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -605,7 +605,7 @@ void ChartDataWrapper::initDataAccess() { //create a separate "internal data provider" that is not connected to the model rtl::Reference<InternalDataProvider> xInternal - = new InternalDataProvider( xChartDoc, /*bConnectToModel*/false, /*bDefaultDataInColumns*/ true ); + = new InternalDataProvider( xChartDoc, /*bConnectToModel*/false ); m_xDataAccess = xInternal; } } diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index e779cae2fc38..d6b980767487 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -74,8 +74,7 @@ public: // (DataInColumns) that will be used when no data is available explicit InternalDataProvider( const rtl::Reference< ::chart::ChartModel > & xChartDoc, - bool bConnectToModel, - bool bDefaultDataInColumns ); + bool bConnectToModel ); explicit InternalDataProvider( const InternalDataProvider & rOther ); virtual ~InternalDataProvider() override; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 409132b48e5c..8ae24816b578 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -792,10 +792,10 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat if( !hasInternalDataProvider() ) { if( bCloneExistingData ) - m_xInternalDataProvider = new InternalDataProvider( this, /*bConnectToModel*/true, /*bDefaultDataInColumns*/ true ); + m_xInternalDataProvider = new InternalDataProvider( this, /*bConnectToModel*/true ); else { - m_xInternalDataProvider = new InternalDataProvider( nullptr, /*bConnectToModel*/true, /*bDefaultDataInColumns*/ true ); + m_xInternalDataProvider = new InternalDataProvider( nullptr, /*bConnectToModel*/true ); m_xInternalDataProvider->setChartModel(this); } m_xDataProvider.set( m_xInternalDataProvider ); diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index f432a430b275..5806ee040dee 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -290,9 +290,8 @@ InternalDataProvider::InternalDataProvider() InternalDataProvider::InternalDataProvider( const rtl::Reference< ChartModel > & xModel, - bool bConnectToModel, - bool bDefaultDataInColumns) -: m_bDataInColumns( bDefaultDataInColumns ) + bool bConnectToModel) +: m_bDataInColumns( true ) { if (!xModel.is()) return; @@ -313,9 +312,9 @@ InternalDataProvider::InternalDataProvider( xModel, aRangeString, aSequenceMapping, m_bDataInColumns, bFirstCellAsLabel, bHasCategories )); // #i120559# if no data was available, restore default - if(!bSomethingDetected && m_bDataInColumns != bDefaultDataInColumns) + if(!bSomethingDetected && !m_bDataInColumns) { - m_bDataInColumns = bDefaultDataInColumns; + m_bDataInColumns = true; } }
