diff options
Diffstat (limited to 'chart2/source/view/main')
-rw-r--r-- | chart2/source/view/main/ChartItemPool.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 8 | ||||
-rw-r--r-- | chart2/source/view/main/DrawModelWrapper.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/PlotterBase.cxx | 5 | ||||
-rw-r--r-- | chart2/source/view/main/PlottingPositionHelper.cxx | 3 | ||||
-rw-r--r-- | chart2/source/view/main/VButton.cxx | 5 | ||||
-rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 16 | ||||
-rw-r--r-- | chart2/source/view/main/VTitle.cxx | 5 |
8 files changed, 9 insertions, 37 deletions
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 44129345dd5c..eb3395507659 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -180,7 +180,7 @@ ChartItemPool::ChartItemPool(): } ChartItemPool::ChartItemPool(const ChartItemPool& rPool): - SfxItemPool(rPool), pItemInfos(nullptr) + SfxItemPool(rPool) { } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 4c393df4edbe..80d99d8d5e4e 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1496,8 +1496,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D drawing::Direction3D aPreferredAspectRatio = rParam.mpSeriesPlotterContainer->getPreferredAspectRatio(); - uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(nullptr); - uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(nullptr); + uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis; + uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis; VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); {//create diagram @@ -1592,7 +1592,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D for( std::unique_ptr<VSeriesPlotter>& aPlotter : rSeriesPlotterList ) { VSeriesPlotter* pSeriesPlotter = aPlotter.get(); - uno::Reference< drawing::XShapes > xSeriesTarget(nullptr); + uno::Reference< drawing::XShapes > xSeriesTarget; if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() ) xSeriesTarget = xSeriesTargetInFrontOfAxis; else @@ -2427,7 +2427,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent ) for( sal_Int32 nN = xParent->getCount(); nN--; ) { uno::Any aAny = xParent->getByIndex( nN ); - Reference< drawing::XShapes> xShapes(nullptr); + Reference< drawing::XShapes> xShapes; if( aAny >>= xShapes ) lcl_removeEmptyGroupShapes( xShapes ); if( xShapes.is() && xShapes->getCount()==0 ) diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 94b6a96323d3..c405b75a0bff 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -52,8 +52,6 @@ namespace chart DrawModelWrapper::DrawModelWrapper() : SdrModel() , m_pChartItemPool(nullptr) - , m_xMainDrawPage(nullptr) - , m_xHiddenDrawPage(nullptr) { m_pChartItemPool = ChartItemPool::CreateChartItemPool(); diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 0778c2954a42..2962f31758a0 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -30,10 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) - : m_xLogicTarget(nullptr) - , m_xFinalTarget(nullptr) - , m_xShapeFactory(nullptr) - , m_pShapeFactory(nullptr) + : m_pShapeFactory(nullptr) , m_aCID() , m_nDimension(nDimensionCount) , m_pPosHelper(nullptr) diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 6c05d96b233a..164f0a8d5f64 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::chart2; PlottingPositionHelper::PlottingPositionHelper() : m_aScales() , m_aMatrixScreenToScene() - , m_xTransformationLogicToScene(nullptr) , m_bSwapXAndY( false ) , m_nXResolution( 1000 ) , m_nYResolution( 1000 ) @@ -62,7 +61,7 @@ PlottingPositionHelper::PlottingPositionHelper() PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rSource ) : m_aScales( rSource.m_aScales ) , m_aMatrixScreenToScene( rSource.m_aMatrixScreenToScene ) - , m_xTransformationLogicToScene( nullptr ) //should be recalculated + // m_xTransformationLogicToScene( nullptr ) //should be recalculated , m_bSwapXAndY( rSource.m_bSwapXAndY ) , m_nXResolution( rSource.m_nXResolution ) , m_nYResolution( rSource.m_nYResolution ) diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index 7dde0f25369a..bd8c5f9749eb 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -30,10 +30,7 @@ namespace chart using namespace css; VButton::VButton() - : m_xShapeFactory(nullptr) - , m_xTarget(nullptr) - , m_xShape(nullptr) - , m_bShowArrow(true) + : m_bShowArrow(true) , m_nArrowColor(0x00000000) , m_nBGColor(0x00E6E6E6) { diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index ec17514df816..34532c8a824f 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -151,12 +151,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_fLogicMinX(0.0) , m_fLogicMaxX(0.0) , m_fLogicZPos(0.0) - , m_xGroupShape(nullptr) - , m_xLabelsGroupShape(nullptr) - , m_xErrorXBarsGroupShape(nullptr) - , m_xErrorYBarsGroupShape(nullptr) - , m_xFrontSubGroupShape(nullptr) - , m_xBackSubGroupShape(nullptr) , m_xDataSeries(xDataSeries) , m_nPointCount(0) @@ -175,16 +169,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_nGlobalSeriesIndex(0) - , m_apLabel_Series(nullptr) - , m_apLabelPropNames_Series(nullptr) - , m_apLabelPropValues_Series(nullptr) - , m_apSymbolProperties_Series(nullptr) - - , m_apLabel_AttributedPoint(nullptr) - , m_apLabelPropNames_AttributedPoint(nullptr) - , m_apLabelPropValues_AttributedPoint(nullptr) - , m_apSymbolProperties_AttributedPoint(nullptr) - , m_apSymbolProperties_InvisibleSymbolForSelection(nullptr) , m_nCurrentAttributedPoint(-1) , m_nMissingValueTreatment(css::chart::MissingValueTreatment::LEAVE_GAP) , m_bAllowPercentValueInDataLabel(false) diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 1ccbe29939a3..5d55b09c479c 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -37,10 +37,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; VTitle::VTitle( const uno::Reference< XTitle > & xTitle ) - : m_xTarget(nullptr) - , m_xShapeFactory(nullptr) - , m_xTitle(xTitle) - , m_xShape(nullptr) + : m_xTitle(xTitle) , m_aCID() , m_fRotationAngleDegree(0.0) , m_nXPos(0) |