diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 10:30:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 14:38:52 +0200 |
| commit | c289c25523496f58b81e061cea82757c99e99957 (patch) | |
| tree | f85f43251ddfce0ea6aa23f46729139c04497b2c /chart2/source/tools | |
| parent | 07e87211c2b2e98fd176fef2018723b50c8dbb1a (diff) | |
loplugin:simplifyconstruct in canvas..cui
Change-Id: I02eba1df117a9d0df42bcac13c3251cb4fa6da14
Reviewed-on: https://gerrit.libreoffice.org/60074
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/tools')
| -rw-r--r-- | chart2/source/tools/LifeTime.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/ObjectIdentifier.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/tools/WrappedPropertySet.cxx | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 431678e485cd..e9b25fee8dcb 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -326,7 +326,7 @@ void CloseableLifeTimeManager::impl_doClose() NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex ); //mutex is not acquired, mutex will be reacquired at the end of this method automatically - uno::Reference< util::XCloseable > xCloseable=nullptr; + uno::Reference< util::XCloseable > xCloseable; try { xCloseable.set(m_pCloseable); diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index c8aca33c28cc..a424dbd29595 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -243,13 +243,11 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID ObjectIdentifier::ObjectIdentifier() :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( nullptr ) { } ObjectIdentifier::ObjectIdentifier( const OUString& rObjectCID ) :m_aObjectCID( rObjectCID ) - ,m_xAdditionalShape( nullptr ) { } @@ -261,7 +259,6 @@ ObjectIdentifier::ObjectIdentifier( const Reference< drawing::XShape >& rxShape ObjectIdentifier::ObjectIdentifier( const Any& rAny ) :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( nullptr ) { const uno::Type& rType = rAny.getValueType(); if ( rType == cppu::UnoType<OUString>::get() ) @@ -1212,7 +1209,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( if(!xChartModel.is()) return nullptr; - Reference< beans::XPropertySet > xObjectProperties = nullptr; + Reference< beans::XPropertySet > xObjectProperties; try { ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); @@ -1408,7 +1405,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) { - Reference< XDataSeries > xSeries(nullptr); + Reference< XDataSeries > xSeries; Reference< XDiagram > xDiagram; Reference< XCoordinateSystem > xCooSys; diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index c099bc76dfc6..d195c59a7c29 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -34,9 +34,6 @@ using ::com::sun::star::uno::Any; WrappedPropertySet::WrappedPropertySet() : MutexContainer() - , m_xInfo(nullptr) - , m_pPropertyArrayHelper(nullptr) - , m_pWrappedPropertyMap(nullptr) { } WrappedPropertySet::~WrappedPropertySet() |