summaryrefslogtreecommitdiff
path: root/chart2/source/view
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-06 10:30:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-06 14:38:52 +0200
commitc289c25523496f58b81e061cea82757c99e99957 (patch)
treef85f43251ddfce0ea6aa23f46729139c04497b2c /chart2/source/view
parent07e87211c2b2e98fd176fef2018723b50c8dbb1a (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/view')
-rw-r--r--chart2/source/view/axes/Tickmarks.cxx2
-rw-r--r--chart2/source/view/axes/Tickmarks_Dates.cxx1
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.cxx8
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx1
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx4
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx5
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx4
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx2
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx8
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx2
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx6
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx4
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx8
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx11
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx8
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--chart2/source/view/main/PlotterBase.cxx5
-rw-r--r--chart2/source/view/main/PlottingPositionHelper.cxx3
-rw-r--r--chart2/source/view/main/VButton.cxx5
-rw-r--r--chart2/source/view/main/VDataSeries.cxx16
-rw-r--r--chart2/source/view/main/VTitle.cxx5
23 files changed, 31 insertions, 83 deletions
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 2fa86b6510e2..33ce421205d3 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -37,7 +37,6 @@ TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse )
, xInverseScaling( xInverse )
, aTickScreenPosition(0.0,0.0)
, bPaintIt( true )
-, xTextShape( nullptr )
, nFactorForLimitedTextWidth(1)
{
}
@@ -91,7 +90,6 @@ TickFactory::TickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_rScale( rScale )
, m_rIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index 9b1d7a50543e..9fe4c657b5f0 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -37,7 +37,6 @@ DateTickFactory::DateTickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_aScale( rScale )
, m_aIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 1566ca41da8d..7b319974bbb5 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -74,8 +74,6 @@ EquidistantTickFactory::EquidistantTickFactory(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
: m_rScale( rScale )
, m_rIncrement( rIncrement )
- , m_xInverseScaling(nullptr)
- , m_pfCurrentValues(nullptr)
{
//@todo: make sure that the scale is valid for the scaling
@@ -418,8 +416,7 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do
, m_pInfoTicks(nullptr)
, m_rIncrement(rIncrement)
, m_nMaxDepth(0)
- , m_nTickCount(0), m_pnPositions(nullptr)
- , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr)
+ , m_nTickCount(0)
, m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
{
initIter( nMaxDepth );
@@ -432,8 +429,7 @@ EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks
, m_pInfoTicks(&rTicks)
, m_rIncrement(rIncrement)
, m_nMaxDepth(0)
- , m_nTickCount(0), m_pnPositions(nullptr)
- , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr)
+ , m_nTickCount(0)
, m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
{
initIter( nMaxDepth );
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index db7d798bfe9b..3ab5ce3ae633 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -231,7 +231,7 @@ void VAxisBase::removeTextShapesFromTicks()
void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter )
{
- Reference< XScaling > xInverseScaling( nullptr );
+ Reference< XScaling > xInverseScaling;
if( m_aScale.Scaling.is() )
xInverseScaling = m_aScale.Scaling->getInverseScaling();
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 03b392c2a676..c2385db62631 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -176,7 +176,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
, m_nAxisType(AxisType::REALNUMBER)
, m_bComplexCategories(false)
, m_pExplicitCategoriesProvider(pExplicitCategoriesProvider)
- , m_xAxisTextProvider(nullptr)
, m_bLimitSpaceForLabels(false)
{
}
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 13cd0b7dba02..a047f7239b59 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -324,7 +324,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick
aStaggerDirection.normalize();
sal_Int32 nDistance=0;
- Reference< drawing::XShape > xShape2DText(nullptr);
+ Reference< drawing::XShape > xShape2DText;
for( TickInfo* pTickInfo = rIter.firstInfo()
; pTickInfo
; pTickInfo = rIter.nextInfo() )
@@ -353,7 +353,7 @@ void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance )
{
if(rStaggerDistance.getLength()==0.0)
return;
- Reference< drawing::XShape > xShape2DText(nullptr);
+ Reference< drawing::XShape > xShape2DText;
for( TickInfo* pTickInfo = rIter.firstInfo()
; pTickInfo
; pTickInfo = rIter.nextInfo() )
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 9d7373cc4abe..a9143d498aac 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -73,10 +73,6 @@ std::unique_ptr<VCoordinateSystem> VCoordinateSystem::createCoordinateSystem(
VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys )
: m_xCooSysModel(xCooSys)
- , m_xLogicTargetForGrids(nullptr)
- , m_xLogicTargetForAxes(nullptr)
- , m_xFinalTarget(nullptr)
- , m_xShapeFactory(nullptr)
, m_aMatrixSceneToScreen()
, m_eLeftWallPos(CuboidPlanePosition_Left)
, m_eBackWallPos(CuboidPlanePosition_Back)
@@ -84,7 +80,6 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo
, m_aMergedMinMaxSupplier()
, m_aExplicitScales(3)
, m_aExplicitIncrements(3)
- , m_apExplicitCategoriesProvider(nullptr)
{
if( !m_xCooSysModel.is() || m_xCooSysModel->getDimension()<3 )
{
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index b0e3f2c86faa..f2b1e2687a4c 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -73,7 +73,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
, PolarPlottingPositionHelper const * pPosHelper
, double fLogicRadius, double fLogicZ )
{
- Reference< XScaling > xInverseScaling( nullptr );
+ Reference< XScaling > xInverseScaling;
if( rScale.Scaling.is() )
xInverseScaling = rScale.Scaling->getInverseScaling();
@@ -164,7 +164,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1];
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0];
- Reference< XScaling > xInverseRadiusScaling( nullptr );
+ Reference< XScaling > xInverseRadiusScaling;
if( rRadiusScale.Scaling.is() )
xInverseRadiusScaling = rRadiusScale.Scaling->getInverseScaling();
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 703cae0129bf..a652c5fad2bd 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -130,7 +130,7 @@ void VPolarRadiusAxis::createShapes()
TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement );
aAngleTickFactory.getAllTicks( aAngleTickInfos );
- uno::Reference< XScaling > xInverseScaling( nullptr );
+ uno::Reference< XScaling > xInverseScaling;
if( rAngleScale.Scaling.is() )
xInverseScaling = rAngleScale.Scaling->getInverseScaling();
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)
{
}
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index f751469d19b9..29a33b248a46 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -50,12 +50,7 @@ using namespace ::com::sun::star::chart2;
VDiagram::VDiagram(
const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio,
sal_Int32 nDimension )
- : m_xTarget(nullptr)
- , m_xShapeFactory(nullptr)
- , m_pShapeFactory(nullptr)
- , m_xOuterGroupShape(nullptr)
- , m_xCoordinateRegionShape(nullptr)
- , m_xWall2D(nullptr)
+ : m_pShapeFactory(nullptr)
, m_nDimensionCount(nDimension)
, m_xDiagram(xDiagram)
, m_aPreferredAspectRatio(rPreferredAspectRatio)
@@ -490,7 +485,7 @@ void VDiagram::createShapes_3d()
//add walls
{
- uno::Reference< beans::XPropertySet > xWallProp( nullptr );
+ uno::Reference< beans::XPropertySet > xWallProp;
if( m_xDiagram.is() )
xWallProp.set( m_xDiagram->getWall() );
@@ -614,7 +609,7 @@ void VDiagram::createShapes_3d()
//add floor plate
{
- uno::Reference< beans::XPropertySet > xFloorProp( nullptr );
+ uno::Reference< beans::XPropertySet > xFloorProp;
if( m_xDiagram.is() )
xFloorProp.set( m_xDiagram->getFloor() );
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)
generated by cgit (git 2.34.1) at 2025-01-09 18:26:42 +0000