diff options
Diffstat (limited to 'chart2/source/tools/DataSourceHelper.cxx')
| -rw-r--r-- | chart2/source/tools/DataSourceHelper.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 92889dbe22d4..57fef259b1f8 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -219,7 +219,9 @@ rtl::Reference< DataSource > DataSourceHelper::pressUsedDataIntoRectangularForma //categories are always the first sequence rtl::Reference< Diagram > xDiagram( xChartDoc->getFirstChartDiagram()); - Reference< chart2::data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); + Reference< chart2::data::XLabeledDataSequence > xCategories; + if (xDiagram) + xCategories = xDiagram->getCategories(); if( xCategories.is() ) aResultVector.push_back( xCategories ); @@ -252,7 +254,7 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( if( xDiagram.is()) { - uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); + uno::Reference< data::XLabeledDataSequence > xCategories( xDiagram->getCategories() ); if( xCategories.is() ) lcl_addRanges( aResult, xCategories ); @@ -279,7 +281,7 @@ rtl::Reference< DataSource > DataSourceHelper::getUsedData( std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult; rtl::Reference< Diagram > xDiagram = rModel.getFirstChartDiagram(); - uno::Reference< chart2::data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); + uno::Reference< chart2::data::XLabeledDataSequence > xCategories( xDiagram->getCategories() ); if( xCategories.is() ) aResult.push_back( xCategories ); @@ -316,8 +318,10 @@ bool DataSourceHelper::detectRangeSegmentation( rOutRangeString, rSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories ); bSomethingDetected = !rOutRangeString.isEmpty(); - uno::Reference< chart2::data::XLabeledDataSequence > xCategories( - DiagramHelper::getCategoriesFromDiagram( xChartModel->getFirstChartDiagram() )); + rtl::Reference<Diagram> xDiagram = xChartModel->getFirstChartDiagram(); + uno::Reference< chart2::data::XLabeledDataSequence > xCategories; + if (xDiagram) + xCategories = xDiagram->getCategories(); rOutHasCategories = xCategories.is(); } catch( uno::Exception & ) |