summaryrefslogtreecommitdiff
path: root/chart2/source/view/charttypes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/charttypes')
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx12
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx6
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx4
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx2
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx8
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx16
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx32
7 files changed, 40 insertions, 40 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 9ef01a23fbb2..8de84f507d43 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -414,7 +414,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries
uno::Reference< drawing::XShape > xShape(nullptr);
if(m_nDimension==3)
{
- double fDepth = this->getTransformedDepth();
+ double fDepth = getTransformedDepth();
sal_Int32 nPolyCount = aPoly.SequenceX.getLength();
for(sal_Int32 nPoly=0;nPoly<nPolyCount;nPoly++)
{
@@ -511,7 +511,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries
if(m_nDimension==3)
{
xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes
- , aPoly, this->getTransformedDepth() );
+ , aPoly, getTransformedDepth() );
}
else //m_nDimension!=3
{
@@ -552,7 +552,7 @@ void AreaChart::impl_createSeriesShapes()
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -699,7 +699,7 @@ void AreaChart::createShapes()
if( rLogicYSumMap.find(nAttachedAxisIndex)==rLogicYSumMap.end() )
rLogicYSumMap[nAttachedAxisIndex]=0.0;
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -737,7 +737,7 @@ void AreaChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget);
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -929,7 +929,7 @@ void AreaChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
- , aScenePosition.PositionZ+this->getTransformedDepth() );
+ , aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 702b90f7569c..85fd8a8bfaa5 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -85,7 +85,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const
if( m_nDimension == 3 )
{
aRet = drawing::Direction3D(1.0,-1.0,1.0);
- BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( MAIN_AXIS_INDEX) ) );
+ BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( MAIN_AXIS_INDEX) ) );
if (pPosHelper)
{
drawing::Direction3D aScale( pPosHelper->getScaledLogicWidth() );
@@ -498,7 +498,7 @@ void BarChart::createShapes()
{
nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
- pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
+ pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
@@ -874,7 +874,7 @@ void BarChart::createShapes()
{
sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
- pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
+ pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 19c278fff217..79165ade1ff6 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -235,7 +235,7 @@ void BubbleChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(*aSeriesIter, xSeriesTarget);
sal_Int32 nAttachedAxisIndex = pSeries->getAttachedAxisIndex();
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper;
PlotterBase::m_pPosHelper = pPosHelper;
@@ -330,7 +330,7 @@ void BubbleChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
- , aScenePosition.PositionZ+this->getTransformedDepth() );
+ , aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 969fcb4550b8..294629fda718 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -151,7 +151,7 @@ void CandleStickChart::createShapes()
{
nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
- pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
+ pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 4ed5410c0729..cf80469a70af 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -265,7 +265,7 @@ void NetChart::impl_createSeriesShapes()
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -404,7 +404,7 @@ void NetChart::createShapes()
if( aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
aLogicYSumMap[nAttachedAxisIndex]=0.0;
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -447,7 +447,7 @@ void NetChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget);
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
- PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
+ PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -617,7 +617,7 @@ void NetChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
- , aScenePosition.PositionZ+this->getTransformedDepth() );
+ , aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 272d26ad82b6..184d824ce919 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -602,7 +602,7 @@ void PieChart::createShapes()
if( !bIsVisible )
continue;
- aParam.mfDepth = this->getTransformedDepth() * (n3DRelativeHeight / 100.0);
+ aParam.mfDepth = getTransformedDepth() * (n3DRelativeHeight / 100.0);
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget);
///collect data point information (logic coordinates, style ):
@@ -773,7 +773,7 @@ PieChart::PieLabelInfo::PieLabelInfo()
bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, const awt::Size& rPageSize, bool bMoveHalfWay, bool bMoveClockwise )
{
//return true if the move was successful
- if(!this->bMovementAllowed)
+ if(!bMovementAllowed)
return false;
const sal_Int32 nLabelDistanceX = rPageSize.Width/50;
@@ -781,7 +781,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///compute the rectangle representing the intersection of the label bounding
///boxes (`aOverlap`).
- ::basegfx::B2IRectangle aOverlap( lcl_getRect( this->xLabelGroupShape ) );
+ ::basegfx::B2IRectangle aOverlap( lcl_getRect( xLabelGroupShape ) );
aOverlap.intersect( lcl_getRect( pFix->xLabelGroupShape ) );
if( !aOverlap.isEmpty() )
{
@@ -797,7 +797,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///`aTangentialDirection` is greater than the vertical component,
///the magnitude of the shift is equal to `aOverlap.Width` else to
///`aOverlap.Height`;
- basegfx::B2IVector aRadiusDirection = this->aFirstPosition - this->aOrigin;
+ basegfx::B2IVector aRadiusDirection = aFirstPosition - aOrigin;
aRadiusDirection.setLength(1.0);
basegfx::B2IVector aTangentialDirection( -aRadiusDirection.getY(), aRadiusDirection.getX() );
bool bShiftHorizontal = abs(aTangentialDirection.getX()) > abs(aTangentialDirection.getY());
@@ -813,17 +813,17 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///`aTangentialDirection` is reversed;
if(!bMoveClockwise)
nShift*=-1;
- awt::Point aOldPos( this->xLabelGroupShape->getPosition() );
+ awt::Point aOldPos( xLabelGroupShape->getPosition() );
basegfx::B2IVector aNewPos = basegfx::B2IVector( aOldPos.X, aOldPos.Y ) + nShift*aTangentialDirection;
///a final check is performed in order to be sure that the moved label
///is still inside the page document;
awt::Point aNewAWTPos( aNewPos.getX(), aNewPos.getY() );
- if( !lcl_isInsidePage( aNewAWTPos, this->xLabelGroupShape->getSize(), rPageSize ) )
+ if( !lcl_isInsidePage( aNewAWTPos, xLabelGroupShape->getSize(), rPageSize ) )
return false;
- this->xLabelGroupShape->setPosition( aNewAWTPos );
- this->bMoved = true;
+ xLabelGroupShape->setPosition( aNewAWTPos );
+ bMoved = true;
}
return true;
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 589812594ff6..160fbd7f194d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -299,9 +299,9 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeFrontChild
if(!xShapes.is())
{
//ensure that the series group shape is already created
- uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) );
+ uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) );
//ensure that the back child is created first
- this->getSeriesGroupShapeBackChild( pDataSeries, xTarget );
+ getSeriesGroupShapeBackChild( pDataSeries, xTarget );
//use series group shape as parent for the new created front group shape
xShapes = createGroupShape( xSeriesShapes );
pDataSeries->m_xFrontSubGroupShape = xShapes;
@@ -316,7 +316,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeBackChild(
if(!xShapes.is())
{
//ensure that the series group shape is already created
- uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) );
+ uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) );
//use series group shape as parent for the new created back group shape
xShapes = createGroupShape( xSeriesShapes );
pDataSeries->m_xBackSubGroupShape = xShapes;
@@ -350,7 +350,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData
if(!xShapes.is())
{
//create a group shape for this series and add to logic target:
- xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
+ xShapes = createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
rShapeGroup = xShapes;
}
return xShapes;
@@ -1011,7 +1011,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is())
{
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
- this->getErrorBarsGroupShape(rVDataSeries, xTarget, false) );
+ getErrorBarsGroupShape(rVDataSeries, xTarget, false) );
createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp
@@ -1033,7 +1033,7 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is())
{
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
- this->getErrorBarsGroupShape(rVDataSeries, xTarget, true) );
+ getErrorBarsGroupShape(rVDataSeries, xTarget, true) );
createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp
@@ -1423,7 +1423,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
- this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
+ getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMinY;
}
@@ -1456,7 +1456,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
- this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
+ getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMaxY;
}
@@ -1975,7 +1975,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange(
double fMinimumY; ::rtl::math::setNan(&fMinimumY);
double fMaximumY; ::rtl::math::setNan(&fMaximumY);
- this->calculateYMinAndMaxForCategory( nCatIndex
+ calculateYMinAndMaxForCategory( nCatIndex
, bSeparateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex );
if(rfMinimumY > fMinimumY)
@@ -2133,7 +2133,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
continue;
std::vector<ViewLegendEntry> aSeriesEntries(
- this->createLegendEntriesForSeries(
+ createLegendEntriesForSeries(
rEntryKeyAspectRatio, *pSeries, xTextProperties,
xTarget, xShapeFactory, xContext));
@@ -2284,8 +2284,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries(
, const Reference< lang::XMultiServiceFactory >& xShapeFactory )
{
- LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle();
- uno::Any aExplicitSymbol( this->getExplicitSymbol( rSeries, -1 ) );
+ LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle();
+ uno::Any aExplicitSymbol( getExplicitSymbol( rSeries, -1 ) );
VLegendSymbolFactory::PropertyType ePropType =
VLegendSymbolFactory::PropertyType::FilledSeries;
@@ -2315,8 +2315,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
, const Reference< lang::XMultiServiceFactory >& xShapeFactory )
{
- LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle();
- uno::Any aExplicitSymbol( this->getExplicitSymbol(rSeries,nPointIndex) );
+ LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle();
+ uno::Any aExplicitSymbol( getExplicitSymbol(rSeries,nPointIndex) );
VLegendSymbolFactory::PropertyType ePropType =
VLegendSymbolFactory::PropertyType::FilledSeries;
@@ -2393,7 +2393,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget ));
// create the symbol
- Reference< drawing::XShape > xShape( this->createLegendSymbolForPoint( rEntryKeyAspectRatio,
+ Reference< drawing::XShape > xShape( createLegendSymbolForPoint( rEntryKeyAspectRatio,
rSeries, nIdx, xSymbolGroup, xShapeFactory ) );
// set CID to symbol for selection
@@ -2422,7 +2422,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget ));
// create the symbol
- Reference< drawing::XShape > xShape( this->createLegendSymbolForSeries(
+ Reference< drawing::XShape > xShape( createLegendSymbolForSeries(
rEntryKeyAspectRatio, rSeries, xSymbolGroup, xShapeFactory ) );
// set CID to symbol for selection
generated by cgit (git 2.34.1) at 2024-07-24 22:42:59 +0000