summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-06 14:49:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-10 09:57:24 +0200
commit4250b25c6ae361359300ab6ccde27230f8e01039 (patch)
tree916a8420282928a92ede0760d696997550ae0840 /chart2
parent2ed9a2b641682d8612b5404bd3978ed049aa0266 (diff)
teach unnecessaryparen loplugin about identifiers
Change-Id: I5710b51e53779c222cec0bf08cd34bda330fec4b Reviewed-on: https://gerrit.libreoffice.org/39737 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.cxx2
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx4
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx6
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx4
5 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index b4af99629772..8b7f777f6411 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -215,7 +215,7 @@ void DataEditor::notifySystemWindow(
if ( pParent && pParent->IsSystemWindow())
{
SystemWindow* pSystemWindow = static_cast< SystemWindow* >( pParent );
- rMemFunc( pSystemWindow->GetTaskPaneList(),( pToRegister ));
+ rMemFunc( pSystemWindow->GetTaskPaneList(), pToRegister );
}
}
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index b32609dae846..3dbfa1810cd4 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -196,7 +196,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
else
{
ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY );
- aCurrentTransform.shearXY(fResultY,-(fResultX));
+ aCurrentTransform.shearXY(fResultY,-fResultX);
}
if(m_aWireframePolyPolygon.count() && m_pScene)
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 77aba167c4c6..9529e4e8a1ab 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -513,7 +513,7 @@ void SAL_CALL ChartModel::load(
Sequence< uno::Any > aStorageArgs( 2 );
aStorageArgs[0] <<= aMDHelper.Stream;
// todo: check if stream is read-only
- aStorageArgs[1] <<= (embed::ElementModes::READ); //WRITE | embed::ElementModes::NOCREATE);
+ aStorageArgs[1] <<= embed::ElementModes::READ; //WRITE | embed::ElementModes::NOCREATE);
xStorage.set( xStorageFact->createInstanceWithArguments( aStorageArgs ),
uno::UNO_QUERY_THROW );
@@ -524,7 +524,7 @@ void SAL_CALL ChartModel::load(
// convert XInputStream to XStorage via the storage factory
Sequence< uno::Any > aStorageArgs( 2 );
aStorageArgs[0] <<= aMDHelper.InputStream;
- aStorageArgs[1] <<= (embed::ElementModes::READ);
+ aStorageArgs[1] <<= embed::ElementModes::READ;
xStorage.set( xStorageFact->createInstanceWithArguments( aStorageArgs ),
uno::UNO_QUERY_THROW );
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 1cb6196d5915..08b9d5a6c6bb 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -690,10 +690,10 @@ void BarChart::createShapes()
double fHeight = fCompleteHeight-fLowerYValue;
if(!bPositive)
fHeight = fCompleteHeight-fUpperYValue;
- fLogicBarWidth = fLogicBaseWidth*fHeight/(fCompleteHeight);
+ fLogicBarWidth = fLogicBaseWidth*fHeight/fCompleteHeight;
if(fLogicBarWidth<=0.0)
fLogicBarWidth=fLogicBaseWidth;
- fLogicBarDepth = fLogicBarDepth*fHeight/(fCompleteHeight);
+ fLogicBarDepth = fLogicBarDepth*fHeight/fCompleteHeight;
if(fLogicBarDepth<=0.0)
fLogicBarDepth*=-1.0;
}
@@ -833,7 +833,7 @@ void BarChart::createShapes()
{
if( lcl_hasGeometry3DVariableWidth(nGeometry3D) && fCompleteHeight!=0.0 )
{
- double fOuterBarDepth = fLogicBarDepth * (fTopHeight)/(fabs(fCompleteHeight));
+ double fOuterBarDepth = fLogicBarDepth * fTopHeight/(fabs(fCompleteHeight));
fLowerBarDepth = (fBaseValue < fUpperYValue) ? fabs(fLogicBarDepth) : fabs(fOuterBarDepth);
fUpperBarDepth = (fBaseValue < fUpperYValue) ? fabs(fOuterBarDepth) : fabs(fLogicBarDepth);
}
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 58f62548d6e0..ff26c60e366b 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -271,7 +271,7 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig
double r1= 0.0, r2 = fRadius;
if(bTopless)
// #i63212# fHeight may be negative, fTopHeight is always positive -> use fabs(fHeight)
- r1 = fRadius * (fTopHeight)/(fabs(fHeight)+fTopHeight);
+ r1 = fRadius * fTopHeight/(fabs(fHeight)+fTopHeight);
nVerticalSegmentCount=1;
drawing::PolyPolygonShape3D aPP;
@@ -478,7 +478,7 @@ uno::Reference<drawing::XShape>
aBottomP3.PositionZ += fDepth;
aBottomP4.PositionZ += fDepth;
- const double fTopFactor = (fTopHeight)/(fabs(fHeight)+fTopHeight);
+ const double fTopFactor = fTopHeight/(fabs(fHeight)+fTopHeight);
drawing::Position3D aTopP1( rPosition.PositionX, rPosition.PositionY, rPosition.PositionZ - fDepth*fTopFactor/2.0 );
if(bRotateZ)
{