Skip to content

C
core
Kaydet (Commit) d96a5c67 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Remove "this->". Pointless. 

Change-Id: I6256c9087eec1f8b9745af6eef23fa59d697f835
üst 3f8a9214
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 22 deletions
chart2/source/view/charttypes/AreaChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -989,7 +989,7 @@ void AreaChart::createShapes() ...@@ -989,7 +989,7 @@ void AreaChart::createShapes()
.transformSceneToScreenPosition( aScenePosition3D ) ); .transformSceneToScreenPosition( aScenePosition3D ) );
} }
this->createDataLabel( m_xTextTarget, **aSeriesIter, nIndex createDataLabel( m_xTextTarget, **aSeriesIter, nIndex
, fLogicValueForLabeDisplay , fLogicValueForLabeDisplay
, rLogicYSumMap[nAttachedAxisIndex], aScreenPosition2D, eAlignment, nOffset ); , rLogicYSumMap[nAttachedAxisIndex], aScreenPosition2D, eAlignment, nOffset );
} }
......
chart2/source/view/charttypes/BarChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -843,10 +843,9 @@ void BarChart::createShapes() ...@@ -843,10 +843,9 @@ void BarChart::createShapes()
} }
} }
awt::Point aScreenPosition2D( this->getLabelScreenPositionAndAlignment( awt::Point aScreenPosition2D = getLabelScreenPositionAndAlignment(
eAlignment, nLabelPlacement eAlignment, nLabelPlacement, fLogicX, fLowerYValue, fUpperYValue, fLogicZ,
, fLogicX, fLowerYValue, fUpperYValue, fLogicZ fLowerBarDepth, fUpperBarDepth, fBaseValue, pPosHelper);
, fLowerBarDepth, fUpperBarDepth, fBaseValue, pPosHelper ));
sal_Int32 nOffset = 0; sal_Int32 nOffset = 0;
if(LABEL_ALIGN_CENTER!=eAlignment) if(LABEL_ALIGN_CENTER!=eAlignment)
{ {
...@@ -854,8 +853,9 @@ void BarChart::createShapes() ...@@ -854,8 +853,9 @@ void BarChart::createShapes()
if( m_nDimension == 3 ) if( m_nDimension == 3 )
nOffset = 260; nOffset = 260;
} }
this->createDataLabel( xTextTarget, **aSeriesIter, nPointIndex createDataLabel(
, fLogicValueForLabeDisplay, fLogicSum, aScreenPosition2D, eAlignment, nOffset ); xTextTarget, **aSeriesIter, nPointIndex,
fLogicValueForLabeDisplay, fLogicSum, aScreenPosition2D, eAlignment, nOffset);
} }
}//end iteration through partial points }//end iteration through partial points
......
chart2/source/view/charttypes/BubbleChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -385,7 +385,7 @@ void BubbleChart::createShapes() ...@@ -385,7 +385,7 @@ void BubbleChart::createShapes()
sal_Int32 nOffset = 0; sal_Int32 nOffset = 0;
if(LABEL_ALIGN_CENTER!=eAlignment) if(LABEL_ALIGN_CENTER!=eAlignment)
nOffset = 100;//add some spacing //@todo maybe get more intelligent values nOffset = 100;//add some spacing //@todo maybe get more intelligent values
this->createDataLabel( xTextTarget, **aSeriesIter, nIndex createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fBubbleSize, fBubbleSize, aScreenPosition2D, eAlignment, nOffset ); , fBubbleSize, fBubbleSize, aScreenPosition2D, eAlignment, nOffset );
} }
} }
......
chart2/source/view/charttypes/CandleStickChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -303,16 +303,16 @@ void CandleStickChart::createShapes() ...@@ -303,16 +303,16 @@ void CandleStickChart::createShapes()
if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) )
{ {
if(isValidPosition(aPosMiddleFirst)) if(isValidPosition(aPosMiddleFirst))
this->createDataLabel( xTextTarget, **aSeriesIter, nIndex createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fUnscaledY_First, 1.0, Position3DToAWTPoint(aPosMiddleFirst), LABEL_ALIGN_LEFT_BOTTOM ); , fUnscaledY_First, 1.0, Position3DToAWTPoint(aPosMiddleFirst), LABEL_ALIGN_LEFT_BOTTOM );
if(isValidPosition(aPosMiddleLast)) if(isValidPosition(aPosMiddleLast))
this->createDataLabel( xTextTarget, **aSeriesIter, nIndex createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fUnscaledY_Last, 1.0, Position3DToAWTPoint(aPosMiddleLast), LABEL_ALIGN_RIGHT_TOP ); , fUnscaledY_Last, 1.0, Position3DToAWTPoint(aPosMiddleLast), LABEL_ALIGN_RIGHT_TOP );
if(isValidPosition(aPosMiddleMinimum)) if(isValidPosition(aPosMiddleMinimum))
this->createDataLabel( xTextTarget, **aSeriesIter, nIndex createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fUnscaledY_Min, 1.0, Position3DToAWTPoint(aPosMiddleMinimum), LABEL_ALIGN_BOTTOM ); , fUnscaledY_Min, 1.0, Position3DToAWTPoint(aPosMiddleMinimum), LABEL_ALIGN_BOTTOM );
if(isValidPosition(aPosMiddleMaximum)) if(isValidPosition(aPosMiddleMaximum))
this->createDataLabel( xTextTarget, **aSeriesIter, nIndex createDataLabel( xTextTarget, **aSeriesIter, nIndex
, fUnscaledY_Max, 1.0, Position3DToAWTPoint(aPosMiddleMaximum), LABEL_ALIGN_TOP ); , fUnscaledY_Max, 1.0, Position3DToAWTPoint(aPosMiddleMaximum), LABEL_ALIGN_TOP );
} }
}//next series in x slot (next y slot) }//next series in x slot (next y slot)
......
chart2/source/view/charttypes/NetChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -678,7 +678,7 @@ void NetChart::createShapes() ...@@ -678,7 +678,7 @@ void NetChart::createShapes()
.transformSceneToScreenPosition( aScenePosition3D ) ); .transformSceneToScreenPosition( aScenePosition3D ) );
} }
this->createDataLabel( m_xTextTarget, **aSeriesIter, nIndex createDataLabel( m_xTextTarget, **aSeriesIter, nIndex
, fLogicValueForLabeDisplay , fLogicValueForLabeDisplay
, aLogicYSumMap[nAttachedAxisIndex], aScreenPosition2D, eAlignment, nOffset ); , aLogicYSumMap[nAttachedAxisIndex], aScreenPosition2D, eAlignment, nOffset );
} }
......
chart2/source/view/charttypes/PieChart.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -492,7 +492,7 @@ void PieChart::createShapes() ...@@ -492,7 +492,7 @@ void PieChart::createShapes()
} }
double nVal = pSeries->getYValue( nPointIndex ); double nVal = pSeries->getYValue( nPointIndex );
aPieLabelInfo.xTextShape = this->createDataLabel( xTextTarget, *pSeries, nPointIndex aPieLabelInfo.xTextShape = createDataLabel( xTextTarget, *pSeries, nPointIndex
, nVal, fLogicYSum, aScreenPosition2D, eAlignment ); , nVal, fLogicYSum, aScreenPosition2D, eAlignment );
uno::Reference< container::XChild > xChild( aPieLabelInfo.xTextShape, uno::UNO_QUERY ); uno::Reference< container::XChild > xChild( aPieLabelInfo.xTextShape, uno::UNO_QUERY );
......
chart2/source/view/charttypes/VSeriesPlotter.cxx
Dosyayı görüntüle @ d96a5c67
...@@ -435,9 +435,10 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re ...@@ -435,9 +435,10 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
else if(LABEL_ALIGN_BOTTOM==eAlignment) else if(LABEL_ALIGN_BOTTOM==eAlignment)
aScreenPosition2D.Y += nOffset; aScreenPosition2D.Y += nOffset;
uno::Reference< drawing::XShapes > xTarget_( uno::Reference< drawing::XShapes > xTarget_ =
m_pShapeFactory->createGroup2D( this->getLabelsGroupShape(rDataSeries, xTarget) m_pShapeFactory->createGroup2D(
, ObjectIdentifier::createPointCID( rDataSeries.getLabelCID_Stub(),nPointIndex ) ) ); getLabelsGroupShape(rDataSeries, xTarget),
ObjectIdentifier::createPointCID( rDataSeries.getLabelCID_Stub(), nPointIndex));
//check whether the label needs to be created and how: //check whether the label needs to be created and how:
DataPointLabel* pLabel = rDataSeries.getDataPointLabelIfLabel( nPointIndex ); DataPointLabel* pLabel = rDataSeries.getDataPointLabelIfLabel( nPointIndex );
...@@ -459,7 +460,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re ...@@ -459,7 +460,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
if(pLabel->ShowLegendSymbol) if(pLabel->ShowLegendSymbol)
{ {
sal_Int32 nSymbolHeight = static_cast< sal_Int32 >( fViewFontSize * 0.6 ); sal_Int32 nSymbolHeight = static_cast< sal_Int32 >( fViewFontSize * 0.6 );
awt::Size aCurrentRatio = this->getPreferredLegendKeyAspectRatio(); awt::Size aCurrentRatio = getPreferredLegendKeyAspectRatio();
sal_Int32 nSymbolWidth = aCurrentRatio.Width; sal_Int32 nSymbolWidth = aCurrentRatio.Width;
if( aCurrentRatio.Height > 0 ) if( aCurrentRatio.Height > 0 )
{ {
...@@ -508,8 +509,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re ...@@ -508,8 +509,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
if(pLabel->ShowNumber) if(pLabel->ShowNumber)
{ {
OUString aNumber( this->getLabelTextForValue( rDataSeries OUString aNumber = getLabelTextForValue(rDataSeries, nPointIndex, fValue, false);
, nPointIndex, fValue, false /*bAsPercentage*/ ) );
if( !aNumber.isEmpty() ) if( !aNumber.isEmpty() )
{ {
if(!aText.isEmpty()) if(!aText.isEmpty())
...@@ -527,8 +527,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re ...@@ -527,8 +527,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
if( fValue < 0 ) if( fValue < 0 )
fValue*=-1.0; fValue*=-1.0;
OUString aPercentage( this->getLabelTextForValue( rDataSeries OUString aPercentage = getLabelTextForValue(rDataSeries, nPointIndex, fValue, true);
, nPointIndex, fValue, true /*bAsPercentage*/ ) );
if( !aPercentage.isEmpty() ) if( !aPercentage.isEmpty() )
{ {
if(!aText.isEmpty()) if(!aText.isEmpty())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment