summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-06-21 12:14:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-06-25 13:53:21 +0200
commit4583911575edf98ccd5b15af8eafa6a3a7b64034 (patch)
treef3f33e53c45dd870f19e7e42db9bb5b4bf1f23bf /chart2/source
parent1942182a3d1817bc539229d7fda3af69f7e295b8 (diff)
improve loplugin:simplifyconstruct
Change-Id: If863d28c6db470faa0d22273020888d4219e069e Reviewed-on: https://gerrit.libreoffice.org/74559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx2
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx3
-rw-r--r--chart2/source/tools/LifeTime.cxx3
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx3
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx3
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx3
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx4
-rw-r--r--chart2/source/view/main/ChartView.cxx6
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx10
-rw-r--r--chart2/source/view/main/VDataSeries.cxx3
-rw-r--r--chart2/source/view/main/VLegend.cxx2
13 files changed, 19 insertions, 27 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 11d5f45e886b..000719180956 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -267,7 +267,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN
m_pDialog->SetPosPixel( Point(0,0) );
tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
- Point aNewOuterPos = Point( aPos.X - aRect.Left(), aPos.Y - aRect.Top() );
+ Point aNewOuterPos( aPos.X - aRect.Left(), aPos.Y - aRect.Top() );
m_pDialog->SetPosPixel( aNewOuterPos );
}
}
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 30cd56d635fc..e3f0a820a272 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -95,7 +95,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt)
m_fAdditionalOffset = 1.0 - m_fInitialOffset;
B2DVector aNewPosVector = m_aStartVector + (m_aDragDirection * m_fAdditionalOffset);
- Point aNewPos = Point( static_cast<long>(aNewPosVector.getX()), static_cast<long>(aNewPosVector.getY()) );
+ Point aNewPos( static_cast<long>(aNewPosVector.getX()), static_cast<long>(aNewPosVector.getY()) );
if( aNewPos != DragStat().GetNow() )
{
Hide();
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 607d0142d6c9..2e3244c3031c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -611,7 +611,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
//the listeners have had no veto
//check whether we self can close
{
- util::CloseVetoException aVetoException = util::CloseVetoException(
+ util::CloseVetoException aVetoException(
"the model itself could not be closed",
static_cast< ::cppu::OWeakObject* >(this) );
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 45d3cc49947d..c00e5ad3457a 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -660,8 +660,7 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque
bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries )
{
- uno::Reference< chart2::data::XDataSource > xDataSource =
- uno::Reference< chart2::data::XDataSource >( xSeries, uno::UNO_QUERY );
+ uno::Reference< chart2::data::XDataSource > xDataSource( xSeries, uno::UNO_QUERY );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aDataSequences = xDataSource->getDataSequences();
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 8a9717ac221c..716670409167 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -352,8 +352,7 @@ void CloseableLifeTimeManager::impl_doClose()
if(xCloseable.is())
{
- uno::Reference< lang::XComponent > xComponent =
- uno::Reference< lang::XComponent >( xCloseable, uno::UNO_QUERY );
+ uno::Reference< lang::XComponent > xComponent( xCloseable, uno::UNO_QUERY );
if(xComponent.is())
{
OSL_ENSURE( m_bClosed, "a not closed component will be disposed " );
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index a50a4e39ba09..6ecfdad87777 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -839,8 +839,7 @@ void AreaChart::createShapes()
pSeries->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
- uno::Reference<drawing::XShape> xPointGroupShape_Shape =
- uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY );
+ uno::Reference<drawing::XShape> xPointGroupShape_Shape( xPointGroupShape_Shapes, uno::UNO_QUERY );
{
nCreatedPoints++;
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 2a029f7b89a8..1a0123f0c094 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -261,8 +261,7 @@ void BubbleChart::createShapes()
pSeries->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
- uno::Reference<drawing::XShape> xPointGroupShape_Shape =
- uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY );
+ uno::Reference<drawing::XShape> xPointGroupShape_Shape( xPointGroupShape_Shapes, uno::UNO_QUERY );
{
nCreatedPoints++;
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 75a82ab18cfd..823004d2091a 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -528,8 +528,7 @@ void NetChart::createShapes()
pSeries->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
- uno::Reference<drawing::XShape> xPointGroupShape_Shape =
- uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY );
+ uno::Reference<drawing::XShape> xPointGroupShape_Shape( xPointGroupShape_Shapes, uno::UNO_QUERY );
{
//create data point
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 8322ff05372b..835c19a449ad 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -877,8 +877,8 @@ void lcl_AddErrorBottomLine( const drawing::Position3D& rPosition, ::basegfx::B2
, const drawing::Position3D& rUnscaledLogicPosition
, bool bYError )
{
- ::basegfx::B2DVector aMainDirection = ::basegfx::B2DVector( rStart.PositionX - rBottomEnd.PositionX
- , rStart.PositionY - rBottomEnd.PositionY );
+ ::basegfx::B2DVector aMainDirection( rStart.PositionX - rBottomEnd.PositionX
+ , rStart.PositionY - rBottomEnd.PositionY );
if( !aMainDirection.getLength() )
{
//get logic clip values:
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 4fc6b67e64c7..9d076e1f9b40 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2308,7 +2308,7 @@ void lcl_createButtons(const uno::Reference<drawing::XShapes>& xPageShapes,
{
std::unique_ptr<VButton> pButton(new VButton);
pButton->init(xPageShapes, xShapeFactory);
- awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100);
+ awt::Point aNewPosition(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100);
sal_Int32 nDimensionIndex = rPageFieldEntry.DimensionIndex;
OUString aFieldOutputDescription = xPivotTableDataProvider->getFieldOutputDescription(nDimensionIndex);
pButton->setLabel(rPageFieldEntry.Name + " | " + aFieldOutputDescription);
@@ -2335,8 +2335,8 @@ void lcl_createButtons(const uno::Reference<drawing::XShapes>& xPageShapes,
std::unique_ptr<VButton> pButton(new VButton);
pButton->init(xPageShapes, xShapeFactory);
- awt::Point aNewPosition = awt::Point(rRemainingSpace.X + x + 100,
- rRemainingSpace.Y + rRemainingSpace.Height - aSize.Height - 100);
+ awt::Point aNewPosition(rRemainingSpace.X + x + 100,
+ rRemainingSpace.Y + rRemainingSpace.Height - aSize.Height - 100);
pButton->setLabel(rRowFieldEntry.Name);
pButton->setCID("FieldButton.Row." + OUString::number(rRowFieldEntry.DimensionIndex));
pButton->setPosition(aNewPosition);
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index d90b502e629f..5d1ab0096ae1 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -732,7 +732,7 @@ static drawing::PolyPolygonBezierCoords getCircularArcBezierCoords(
//at least one polygon is created using two normal and two control points
//if the angle is larger it is separated into multiple sub angles
- drawing::PolyPolygonBezierCoords aReturn = drawing::PolyPolygonBezierCoords();
+ drawing::PolyPolygonBezierCoords aReturn;
sal_Int32 nSegmentCount = static_cast< sal_Int32 >( fWidthAngleRadian/fAngleSubdivisionRadian );
if( fWidthAngleRadian > fAngleSubdivisionRadian*nSegmentCount )
nSegmentCount++;
@@ -842,7 +842,7 @@ static drawing::PolyPolygonBezierCoords getRingBezierCoords(
, const ::basegfx::B2DHomMatrix& aTransformationFromUnitCircle
, const double fAngleSubdivisionRadian )
{
- drawing::PolyPolygonBezierCoords aReturn = drawing::PolyPolygonBezierCoords();
+ drawing::PolyPolygonBezierCoords aReturn;
aReturn.Coordinates = drawing::PointSequenceSequence(1);
aReturn.Flags = drawing::FlagSequenceSequence(1);
@@ -1776,8 +1776,7 @@ uno::Reference< drawing::XShapes >
}
//return
- uno::Reference< drawing::XShapes > xShapes =
- uno::Reference<drawing::XShapes>( xShape, uno::UNO_QUERY );
+ uno::Reference< drawing::XShapes > xShapes( xShape, uno::UNO_QUERY );
return xShapes;
}
catch( const uno::Exception& )
@@ -1829,8 +1828,7 @@ uno::Reference< drawing::XShapes >
setShapeName( xShape , aName );
//return
- uno::Reference< drawing::XShapes > xShapes =
- uno::Reference<drawing::XShapes>( xShape, uno::UNO_QUERY );
+ uno::Reference< drawing::XShapes > xShapes( xShape, uno::UNO_QUERY );
return xShapes;
}
catch( const uno::Exception& )
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index f606883e3fbd..6781f2044e7c 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -174,8 +174,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
::rtl::math::setNan( & m_fXMeanValue );
::rtl::math::setNan( & m_fYMeanValue );
- uno::Reference<data::XDataSource> xDataSource =
- uno::Reference<data::XDataSource>( xDataSeries, uno::UNO_QUERY );
+ uno::Reference<data::XDataSource> xDataSource( xDataSeries, uno::UNO_QUERY );
uno::Sequence< uno::Reference<
chart2::data::XLabeledDataSequence > > aDataSequences =
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index bbb0707f7a0f..43f103db7ca1 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -798,7 +798,7 @@ std::vector<std::shared_ptr<VButton>> lcl_createButtons(
std::shared_ptr<VButton> pButton(new VButton);
aButtons.push_back(pButton);
pButton->init(xLegendContainer, xShapeFactory);
- awt::Point aNewPosition = awt::Point(x, y);
+ awt::Point aNewPosition(x, y);
pButton->setLabel(sColumnFieldEntry.Name);
pButton->setCID("FieldButton.Column." + OUString::number(sColumnFieldEntry.DimensionIndex));
pButton->setPosition(aNewPosition);