summaryrefslogtreecommitdiffstats
path: root/chart2
diff options
context:
space:
mode:
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx2
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx2
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx4
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx2
-rw-r--r--chart2/source/view/charttypes/Splines.cxx4
-rw-r--r--chart2/source/view/main/VLegend.cxx24
9 files changed, 24 insertions, 24 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 8b5d0800b25f..0562ef61f3e3 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -335,7 +335,7 @@ Any WrappedSegmentOffsetProperty::convertOuterToInnerValue( const Any& rOuterVal
Any aResult( rOuterValue );
if( rOuterValue >>= nOffset )
- aResult <<= (static_cast< double >( nOffset ) / 100.0);
+ aResult <<= static_cast< double >( nOffset ) / 100.0;
return aResult;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 7604af7234d6..c55c03d7b976 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -420,7 +420,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
(rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount) &&
nIntervalCount > 0 )
{
- aRet <<= ( fStepMain / static_cast< double >( nIntervalCount ) );
+ aRet <<= fStepMain / static_cast< double >( nIntervalCount );
bNeedToCalculateExplicitValues = false;
}
}
@@ -448,9 +448,9 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
}
}
else
- aRet <<= ( aExplicitIncrement.Distance /
+ aRet <<= aExplicitIncrement.Distance /
static_cast< double >(
- aExplicitIncrement.SubIncrements[ 0 ].IntervalCount ));
+ aExplicitIncrement.SubIncrements[ 0 ].IntervalCount );
}
else
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index b6da99147888..365c6af63b28 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -59,7 +59,7 @@ Any WrappedTextRotationProperty::convertOuterToInnerValue( const Any& rOuterValu
sal_Int32 nVal = 0;
if( rOuterValue >>= nVal )
{
- double fDoubleDegrees = ( static_cast< double >( nVal ) / 100.0 );
+ double fDoubleDegrees = static_cast< double >( nVal ) / 100.0;
aRet <<= fDoubleDegrees;
}
return aRet;
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 5205d9620753..d0eeddf9ce01 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -148,7 +148,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
// @todo: using implicit knowledge that ranges can be
// merged with ";". This should be done more general
- pCellRange->Value <<= (aOldRange + ";" + aRangeString );
+ pCellRange->Value <<= aOldRange + ";" + aRangeString;
}
// move means replace range
else
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index c150e7b297c9..c352f99f4df7 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -87,7 +87,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt)
if( DragStat().CheckMinMoved(rPnt) )
{
//calculate new offset
- B2DVector aShiftVector(( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector ));
+ B2DVector aShiftVector( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector );
m_fAdditionalOffset = m_aDragDirection.scalar( aShiftVector )/m_fDragRange; // projection
if( m_fAdditionalOffset < -m_fInitialOffset )
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index b7481665a1a6..401cd70895f0 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -66,9 +66,9 @@ void UndoCommandDispatch::fireStatusEvent(
const bool bFireAll = rURL.isEmpty();
uno::Any aUndoState, aRedoState;
if( m_xUndoManager->isUndoPossible())
- aUndoState <<= ( SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
+ aUndoState <<= SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle();
if( m_xUndoManager->isRedoPossible())
- aRedoState <<= ( SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
+ aRedoState <<= SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle();
if( bFireAll || rURL == ".uno:Undo" )
fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 6c014dd0848a..a53e625c2a7c 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -612,7 +612,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
nMaxMainIncrementCount--;
//choose major time interval:
- long nDayCount = (aMaxDate-aMinDate);
+ long nDayCount = aMaxDate - aMinDate;
long nMainIncrementCount = 1;
if( !bAutoMajor )
{
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index c03df7c7d719..3527d1bec01f 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -158,7 +158,7 @@ void lcl_SplineCalculation::Calculate()
else
{
m_aSecDerivY[ 0 ] = -0.5;
- double xDiff = ( m_aPoints[ 1 ].first - m_aPoints[ 0 ].first );
+ double xDiff = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
u[ 0 ] = ( 3.0 / xDiff ) *
((( m_aPoints[ 1 ].second - m_aPoints[ 0 ].second ) / xDiff ) - m_fYp1 );
}
@@ -193,7 +193,7 @@ void lcl_SplineCalculation::Calculate()
if( ! ::rtl::math::isInf( m_fYpN ) )
{
qn = 0.5;
- double xDiff = ( m_aPoints[ n ].first - m_aPoints[ n - 1 ].first );
+ double xDiff = m_aPoints[ n ].first - m_aPoints[ n - 1 ].first;
un = ( 3.0 / xDiff ) *
( m_fYpN - ( m_aPoints[ n ].second - m_aPoints[ n - 1 ].second ) / xDiff );
}
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index a7a313b0ad49..52a4f78fd8c9 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -202,7 +202,7 @@ void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal
{
for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn )
{
- sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
+ sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < nNumberOfEntries )
{
awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() );
@@ -228,7 +228,7 @@ void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int3
sal_Int32 nCurrentRowHeight = 0;
for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn)
{
- sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
+ sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < nNumberOfEntries )
{
awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() );
@@ -397,7 +397,7 @@ awt::Size lcl_placeLegendEntries(
{
for (sal_Int32 nColumn = nNumberOfColumns; nColumn--; )
{
- sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
+ sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < static_cast<sal_Int32>(aTextShapes.size()) )
{
DrawModelWrapper::removeShape( aTextShapes[nEntry] );
@@ -526,7 +526,7 @@ awt::Size lcl_placeLegendEntries(
sal_Int32 nCurrentYPos = nYPadding + nYStartPosition;
for (sal_Int32 nRow = 0; nRow < nNumberOfRows; ++nRow)
{
- sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
+ sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry >= nNumberOfEntries )
break;
@@ -625,8 +625,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_LINE_START:
{
// #i109336# Improve auto positioning in chart
- const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) /
- static_cast< double >( rPageSize.Width ) );
+ const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) /
+ static_cast< double >( rPageSize.Width );
aResult = chart2::RelativePosition(
fDefaultDistance, 0.5, drawing::Alignment_LEFT );
}
@@ -634,8 +634,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_LINE_END:
{
// #i109336# Improve auto positioning in chart
- const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) /
- static_cast< double >( rPageSize.Width ) );
+ const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) /
+ static_cast< double >( rPageSize.Width );
aResult = chart2::RelativePosition(
1.0 - fDefaultDistance, 0.5, drawing::Alignment_RIGHT );
}
@@ -643,8 +643,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_PAGE_START:
{
// #i109336# Improve auto positioning in chart
- const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) /
- static_cast< double >( rPageSize.Height ) );
+ const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) /
+ static_cast< double >( rPageSize.Height );
double fDistance = (static_cast<double>(rOutAvailableSpace.Y)/static_cast<double>(rPageSize.Height)) + fDefaultDistance;
aResult = chart2::RelativePosition(
0.5, fDistance, drawing::Alignment_TOP );
@@ -653,8 +653,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_PAGE_END:
{
// #i109336# Improve auto positioning in chart
- const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) /
- static_cast< double >( rPageSize.Height ) );
+ const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) /
+ static_cast< double >( rPageSize.Height );
double fDistance = double(rPageSize.Height - (rOutAvailableSpace.Y + rOutAvailableSpace.Height));
fDistance += fDefaultDistance;
generated by cgit (git 2.34.1) at 2024-06-16 18:22:00 +0000