diff options
Diffstat (limited to 'chart2/source/view/charttypes')
| -rw-r--r-- | chart2/source/view/charttypes/AreaChart.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/BarChart.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/CandleStickChart.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/NetChart.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/PieChart.cxx | 8 |
5 files changed, 11 insertions, 17 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index c7932cbe590a..58acc66a749c 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -66,10 +66,6 @@ AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel , m_eCurveStyle(CurveStyle_LINES) , m_nCurveResolution(20) , m_nSplineOrder(3) - , m_xSeriesTarget(nullptr) - , m_xErrorBarTarget(nullptr) - , m_xTextTarget(nullptr) - , m_xRegressionCurveEquationTarget(nullptr) { m_pMainPosHelper->AllowShiftXAxisPos(true); m_pMainPosHelper->AllowShiftZAxisPos(true); @@ -415,7 +411,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { double fDepth = getTransformedDepth(); @@ -511,7 +507,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create area: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 3a7bf3f6a599..3d9aae4bf942 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( SAL_WARN("chart2", "Exception caught. " << e ); } - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; switch( nGeometry3D ) { case DataPointGeometry3D::CYLINDER: diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 3342bee2df56..cff376eac322 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -115,8 +115,8 @@ void CandleStickChart::createShapes() { m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst; - uno::Reference< beans::XPropertySet > xWhiteDayProps(nullptr); - uno::Reference< beans::XPropertySet > xBlackDayProps(nullptr); + uno::Reference< beans::XPropertySet > xWhiteDayProps; + uno::Reference< beans::XPropertySet > xBlackDayProps; m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; @@ -213,7 +213,7 @@ void CandleStickChart::createShapes() xLossGainTarget = xLossTarget; uno::Reference< beans::XPropertySet > xPointProp( pSeries->getPropertiesOfPoint( nIndex )); - uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(nullptr); + uno::Reference< drawing::XShapes > xPointGroupShape_Shapes; { OUString aPointCID = ObjectIdentifier::createPointCID( pSeries->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(pSeries.get(), xSeriesTarget) ); diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index d08547f54b88..c5f38386bd3f 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -59,8 +59,6 @@ NetChart::NetChart( const uno::Reference<XChartType>& xChartTypeModel , m_pMainPosHelper(std::move(pPlottingPositionHelper)) , m_bArea(!bNoArea) , m_bLine(bNoArea) - , m_xSeriesTarget(nullptr) - , m_xTextTarget(nullptr) { // we only support 2D Net charts assert(nDimensionCount == 2); @@ -158,7 +156,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index febee25a0806..7f03317b5daa 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -238,7 +238,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( } //create point - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { xShape = m_pShapeFactory->createPieSegment( xTarget @@ -661,7 +661,7 @@ void PieChart::createShapes() aParam.mfUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius ); ///point color: - std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(nullptr); + std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap; if (!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) { apOverwritePropertiesMap.reset( new tPropertyNameValueMap ); @@ -754,8 +754,8 @@ bool lcl_isInsidePage( const awt::Point& rPos, const awt::Size& rSize, const awt }//end anonymous namespace PieChart::PieLabelInfo::PieLabelInfo() - : xTextShape(nullptr), xLabelGroupShape(nullptr), aFirstPosition(), aOrigin(), fValue(0.0) - , bMovementAllowed(false), bMoved(false), xTextTarget(nullptr), pPrevious(nullptr),pNext(nullptr) + : aFirstPosition(), aOrigin(), fValue(0.0) + , bMovementAllowed(false), bMoved(false), pPrevious(nullptr),pNext(nullptr) { } |