chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 6 +-- chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 16 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit dc503bfebf8a9d4dc512d46bfcb01e8c8b4bbb93 Author: Noel Grandin <[email protected]> AuthorDate: Wed Jan 19 08:37:06 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jan 19 08:59:17 2022 +0100 use more concrete types in chart2, ChartModel Change-Id: I6fea07e7b9684b5333c908dbb353aeda58dd73a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128583 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 88f362070795..cb91fc02ebe9 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -223,7 +223,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( *m_xChartModel.get() ) ); - OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, *m_xChartModel.get() ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, uno::Reference<XChartDocument>(m_xChartModel.get()) ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -236,7 +236,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( *m_xChartModel.get() ) ); - OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, *m_xChartModel.get() ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, uno::Reference<XChartDocument>(m_xChartModel.get()) ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; @@ -248,7 +248,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< css::chart2::X ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xTitle.is() ) { - OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel.get() ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, uno::Reference<XChartDocument>(m_xChartModel.get()) ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index d69d67676c66..32bee8d42c50 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -176,7 +176,7 @@ struct lcl_DataOperator : public lcl_Operator struct lcl_RowDescriptionsOperator : public lcl_Operator { lcl_RowDescriptionsOperator( const Sequence< OUString >& rRowDescriptions - , const Reference< chart2::XChartDocument >& xChartDoc ) + , const rtl::Reference<::chart::ChartModel>& xChartDoc ) : m_rRowDescriptions( rRowDescriptions ) , m_xChartDoc(xChartDoc) , m_bDataInColumns(true) @@ -200,14 +200,14 @@ struct lcl_RowDescriptionsOperator : public lcl_Operator } const Sequence< OUString >& m_rRowDescriptions; - Reference< chart2::XChartDocument > m_xChartDoc; + rtl::Reference<::chart::ChartModel> m_xChartDoc; bool m_bDataInColumns; }; struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator { lcl_ComplexRowDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexRowDescriptions - , const Reference< chart2::XChartDocument >& xChartDoc ) + , const rtl::Reference<::chart::ChartModel>& xChartDoc ) : m_rComplexRowDescriptions( rComplexRowDescriptions ) , m_xChartDoc(xChartDoc) , m_bDataInColumns(true) @@ -231,7 +231,7 @@ struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator } const Sequence< Sequence< OUString > >& m_rComplexRowDescriptions; - Reference< chart2::XChartDocument > m_xChartDoc; + rtl::Reference<::chart::ChartModel> m_xChartDoc; bool m_bDataInColumns; }; @@ -259,7 +259,7 @@ struct lcl_AnyRowDescriptionsOperator : public lcl_Operator struct lcl_ColumnDescriptionsOperator : public lcl_Operator { lcl_ColumnDescriptionsOperator( const Sequence< OUString >& rColumnDescriptions - , const Reference< chart2::XChartDocument >& xChartDoc ) + , const rtl::Reference<::chart::ChartModel>& xChartDoc ) : m_rColumnDescriptions( rColumnDescriptions ) , m_xChartDoc(xChartDoc) , m_bDataInColumns(true) @@ -283,14 +283,14 @@ struct lcl_ColumnDescriptionsOperator : public lcl_Operator } const Sequence< OUString >& m_rColumnDescriptions; - Reference< chart2::XChartDocument > m_xChartDoc; + rtl::Reference<::chart::ChartModel> m_xChartDoc; bool m_bDataInColumns; }; struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator { lcl_ComplexColumnDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexColumnDescriptions - , const Reference< chart2::XChartDocument >& xChartDoc ) + , const rtl::Reference<::chart::ChartModel>& xChartDoc ) : m_rComplexColumnDescriptions( rComplexColumnDescriptions ) , m_xChartDoc(xChartDoc) , m_bDataInColumns(true) @@ -314,7 +314,7 @@ struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator } const Sequence< Sequence< OUString > >& m_rComplexColumnDescriptions; - Reference< chart2::XChartDocument > m_xChartDoc; + rtl::Reference<::chart::ChartModel> m_xChartDoc; bool m_bDataInColumns; };
