diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-01-19 19:52:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-19 20:55:07 +0100 |
| commit | c6b8383e90c56efec87110f5303e64351aba9a1b (patch) | |
| tree | 480372250eec542575828a74e5fef8e138e7389c | |
| parent | 79a2b786d3c39a4a756fb13778e437a20758caf8 (diff) | |
use more concrete types in chart2, SvNumberFormatsSupplierObj
Change-Id: I15bb69bab11e374db2bfa2b964ba820063f01cda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128631
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | chart2/inc/ChartModel.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 2040c12b7513..cad6f0422a72 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -66,6 +66,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::uno { class XAggregation; } class SvNumberFormatter; +class SvNumberFormatsSupplierObj; namespace chart { @@ -153,8 +154,7 @@ private: */ rtl::Reference< InternalDataProvider > m_xInternalDataProvider; - css::uno::Reference< css::util::XNumberFormatsSupplier > - m_xOwnNumberFormatsSupplier; + rtl::Reference< SvNumberFormatsSupplierObj > m_xOwnNumberFormatsSupplier; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; std::unique_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 66248107227c..95aaf733233c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -540,7 +540,7 @@ void SAL_CALL ChartModel::dispose() m_xDataProvider.clear(); m_xInternalDataProvider.clear(); m_xNumberFormatsSupplier.clear(); - DisposeHelper::DisposeAndClear( m_xOwnNumberFormatsSupplier ); + m_xOwnNumberFormatsSupplier.clear(); m_xChartTypeManager.clear(); m_xDiagram.clear(); DisposeHelper::DisposeAndClear( m_xTitle ); @@ -800,9 +800,9 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti { { MutexGuard aGuard( m_aModelMutex ); - if( xNewSupplier==m_xNumberFormatsSupplier ) + if( xNewSupplier == m_xNumberFormatsSupplier ) return; - if( xNewSupplier==m_xOwnNumberFormatsSupplier ) + if( xNewSupplier == uno::Reference<XNumberFormatsSupplier>(m_xOwnNumberFormatsSupplier) ) return; if( m_xOwnNumberFormatsSupplier.is() && xNewSupplier.is() ) { |