diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-22 14:02:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-22 21:00:00 +0200 |
| commit | c3bc67bffd1e0b9bdd60ef274a6d5e59101d322d (patch) | |
| tree | 97dadd3338fb57478bcd1fc223322384df971f68 /chart2 | |
| parent | 40a428fde0a33e7127dfa30845d65c698e408053 (diff) | |
tdf#151091 Revert "tdf#148635 cache some chart stuff"
This reverts commit fd2ca9607431fc6ca49e37ab6fef228aa72da5f9,
since it causes a regression when copying a chart.
Change-Id: I5d40de6f46b4b3e68531257d27f9a81540a06da4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140427
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index a9479cd6fc62..d5ede5c7b5a0 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1098,8 +1098,7 @@ public: private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; - mutable Any m_aOuterValue; - mutable bool m_bDetectedRangeSegmentation { false }; + mutable Any m_aOuterValue; }; } @@ -1153,19 +1152,15 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro bool bHasCategories = true; uno::Sequence< sal_Int32 > aSequenceMapping; - if (!m_bDetectedRangeSegmentation) + if( DataSourceHelper::detectRangeSegmentation( + m_spChart2ModelContact->getDocumentModel(), aRangeString, aSequenceMapping, bUseColumns + , bFirstCellAsLabel, bHasCategories ) ) { - if( DataSourceHelper::detectRangeSegmentation( - m_spChart2ModelContact->getDocumentModel(), aRangeString, aSequenceMapping, bUseColumns - , bFirstCellAsLabel, bHasCategories ) ) - { - css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; - if(bUseColumns) - eChartDataRowSource = css::chart::ChartDataRowSource_COLUMNS; + css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; + if(bUseColumns) + eChartDataRowSource = css::chart::ChartDataRowSource_COLUMNS; - m_aOuterValue <<= eChartDataRowSource; - } - m_bDetectedRangeSegmentation = true; + m_aOuterValue <<= eChartDataRowSource; } return m_aOuterValue; |