diff options
Diffstat (limited to 'chart2/source/controller/dialogs')
-rw-r--r-- | chart2/source/controller/dialogs/DialogModel.cxx | 9 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/DialogModel.hxx | 3 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 13c7571b4b17..cef69be4ecc3 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -34,6 +34,7 @@ #include <ThreeDHelper.hxx> #include <ChartModel.hxx> #include <BaseCoordinateSystem.hxx> +#include <LabeledDataSequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -595,15 +596,15 @@ void DialogModel::deleteSeries( DataSeriesHelper::deleteSeries( xSeries, xChartType ); } -Reference< data::XLabeledDataSequence > DialogModel::getCategories() const +rtl::Reference< LabeledDataSequence > DialogModel::getCategories() const { - Reference< data::XLabeledDataSequence > xResult; + rtl::Reference< LabeledDataSequence > xResult; try { if( m_xChartDocument.is()) { rtl::Reference< Diagram > xDiagram( m_xChartDocument->getFirstChartDiagram()); - xResult.set( DiagramHelper::getCategoriesFromDiagram( xDiagram )); + xResult = DiagramHelper::getCategoriesFromDiagram( xDiagram ); } } catch( const uno::Exception & ) @@ -636,7 +637,7 @@ void DialogModel::setCategories( const Reference< chart2::data::XLabeledDataSequ OUString DialogModel::getCategoriesRange() const { - Reference< data::XLabeledDataSequence > xLSeq( getCategories()); + rtl::Reference< LabeledDataSequence > xLSeq( getCategories()); OUString aRange; if( xLSeq.is()) { diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index fd3ef59b1fd5..edc87d2e9356 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -49,6 +49,7 @@ class ChartType; class ChartTypeTemplate; class DataSeries; struct InterpretedData; +class LabeledDataSequence; class RangeSelectionHelper; struct DialogModelTimeBasedInfo @@ -119,7 +120,7 @@ public: const css::uno::Reference< css::chart2::XDataSeries > & xSeries, const rtl::Reference< ::chart::ChartType > & xChartType ); - css::uno::Reference< css::chart2::data::XLabeledDataSequence > + rtl::Reference< ::chart::LabeledDataSequence > getCategories() const; void setCategories( const css::uno::Reference< css::chart2::data::XLabeledDataSequence > & xCategories ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index d9e19e8c5da4..e208db89a6ff 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -29,6 +29,7 @@ #include <DataSeriesHelper.hxx> #include <ControllerLockGuard.hxx> #include <DataSourceHelper.hxx> +#include <LabeledDataSequence.hxx> #include "DialogModel.hxx" #include <o3tl/safeint.hxx> #include <TabPageNotifiable.hxx> @@ -752,7 +753,7 @@ bool DataSourceTabPage::updateModelFromControl(const weld::Entry* pField) if (bAll || (pField == m_xEDT_CATEGORIES.get())) { - Reference< data::XLabeledDataSequence > xLabeledSeq( m_rDialogModel.getCategories() ); + rtl::Reference< LabeledDataSequence > xLabeledSeq( m_rDialogModel.getCategories() ); if( xDataProvider.is()) { OUString aRange(m_xEDT_CATEGORIES->get_text()); @@ -761,7 +762,7 @@ bool DataSourceTabPage::updateModelFromControl(const weld::Entry* pField) // create or change categories if( !xLabeledSeq.is()) { - xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence() ); + xLabeledSeq = DataSourceHelper::createLabeledDataSequence(); m_rDialogModel.setCategories( xLabeledSeq ); } try |