summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/axes')
-rw-r--r--chart2/source/view/axes/Tickmarks.cxx4
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.cxx12
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx4
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx24
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx8
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx32
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx6
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx8
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx4
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.cxx34
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx10
11 files changed, 73 insertions, 73 deletions
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 901242455252..60a8d4bcf167 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -210,7 +210,7 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence&
if( fInnerDirectionSign==0.0 )
fInnerDirectionSign = 1.0;
- B2DVector aTickScreenPosition = this->getTickScreenPosition2D(fScaledLogicTickValue);
+ B2DVector aTickScreenPosition = getTickScreenPosition2D(fScaledLogicTickValue);
if( bPlaceAtLabels )
aTickScreenPosition += m_aAxisLineToLabelLineShift;
@@ -305,7 +305,7 @@ void TickFactory2D::updateScreenValues( TickInfoArraysType& rAllTickInfos ) cons
{
TickInfo& rTickInfo = (*aTickIter);
rTickInfo.aTickScreenPosition =
- this->getTickScreenPosition2D( rTickInfo.fScaledTickValue );
+ getTickScreenPosition2D( rTickInfo.fScaledTickValue );
}
}
}
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index df37b2ef07fd..e22faf768011 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -146,7 +146,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::
if(!pfNextParentTick)
return;
- sal_Int32 nMaxSubTickCount = this->getMaxTickCount( nDepth );
+ sal_Int32 nMaxSubTickCount = getMaxTickCount( nDepth );
if(!nMaxSubTickCount)
return;
@@ -159,7 +159,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::
{
for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ )
{
- pValue = this->getMinorTick( nPartTick, nDepth
+ pValue = getMinorTick( nPartTick, nDepth
, fLastParentTick, *pfNextParentTick );
if(!pValue)
continue;
@@ -311,8 +311,8 @@ bool EquidistantTickFactory::isVisible( double fScaledValue ) const
void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const
{
//create point sequences for each tick depth
- sal_Int32 nDepthCount = this->getTickDepth();
- sal_Int32 nMaxMajorTickCount = this->getMaxTickCount(0);
+ sal_Int32 nDepthCount = getTickDepth();
+ sal_Int32 nMaxMajorTickCount = getMaxTickCount(0);
if (nDepthCount <= 0 || nMaxMajorTickCount <= 0)
return;
@@ -323,7 +323,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co
sal_Int32 nRealMajorTickCount = 0;
for( sal_Int32 nMajorTick=0; nMajorTick<nMaxMajorTickCount; nMajorTick++ )
{
- double* pValue = this->getMajorTick( nMajorTick );
+ double* pValue = getMajorTick( nMajorTick );
if(!pValue)
continue;
aAllTicks[0][nRealMajorTickCount] = *pValue;
@@ -334,7 +334,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co
aAllTicks[0].realloc(nRealMajorTickCount);
if(nDepthCount>0)
- this->addSubTicks( 1, aAllTicks );
+ addSubTicks( 1, aAllTicks );
//so far we have added all ticks between the outer major tick marks
//this was necessary to create sub ticks correctly
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 59ed66cdc917..2f48b1c8facf 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -152,7 +152,7 @@ void VAxisBase::setExplicitScaleAndIncrement(
void VAxisBase::createAllTickInfos( TickInfoArraysType& rAllTickInfos )
{
- std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
if( m_aScale.ShiftedCategoryPosition )
apTickFactory->getAllTicksShifted( rAllTickInfos );
else
@@ -178,7 +178,7 @@ bool VAxisBase::prepareShapeCreation()
return true;
//create named group shape
- m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : "");
+ m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : "");
if( m_aAxisProperties.m_bDisplayLabels )
m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget, m_aCID );
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index f791d065a126..43ef2d33ea12 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -273,7 +273,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
void AxisProperties::init( bool bCartesian )
{
uno::Reference< beans::XPropertySet > xProp =
- uno::Reference<beans::XPropertySet>::query( this->m_xAxisModel );
+ uno::Reference<beans::XPropertySet>::query( m_xAxisModel );
if( !xProp.is() )
return;
@@ -347,11 +347,11 @@ void AxisProperties::init( bool bCartesian )
else if(m_nMajorTickmarks!=0)
nMaxDepth=1;
- this->m_aTickmarkPropertiesList.clear();
+ m_aTickmarkPropertiesList.clear();
for( sal_Int32 nDepth=0; nDepth<nMaxDepth; nDepth++ )
{
- TickmarkProperties aTickmarkProperties = this->makeTickmarkProperties( nDepth );
- this->m_aTickmarkPropertiesList.push_back( aTickmarkProperties );
+ TickmarkProperties aTickmarkProperties = makeTickmarkProperties( nDepth );
+ m_aTickmarkPropertiesList.push_back( aTickmarkProperties );
}
}
catch( const uno::Exception& e )
@@ -382,26 +382,26 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
{
try
{
- xProp->getPropertyValue( "TextBreak" ) >>= this->bLineBreakAllowed;
- xProp->getPropertyValue( "TextOverlap" ) >>= this->bOverlapAllowed;
- xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters;
- xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree;
+ xProp->getPropertyValue( "TextBreak" ) >>= bLineBreakAllowed;
+ xProp->getPropertyValue( "TextOverlap" ) >>= bOverlapAllowed;
+ xProp->getPropertyValue( "StackCharacters" ) >>= bStackCharacters;
+ xProp->getPropertyValue( "TextRotation" ) >>= fRotationAngleDegree;
css::chart::ChartAxisArrangeOrderType eArrangeOrder;
xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder;
switch(eArrangeOrder)
{
case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE:
- this->eStaggering = SIDE_BY_SIDE;
+ eStaggering = SIDE_BY_SIDE;
break;
case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN:
- this->eStaggering = STAGGER_EVEN;
+ eStaggering = STAGGER_EVEN;
break;
case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD:
- this->eStaggering = STAGGER_ODD;
+ eStaggering = STAGGER_ODD;
break;
default:
- this->eStaggering = STAGGER_AUTO;
+ eStaggering = STAGGER_AUTO;
break;
}
}
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 63d50e40e172..d5429ac3ff59 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1560,7 +1560,7 @@ void VCartesianAxis::createLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1614,7 +1614,7 @@ void VCartesianAxis::createMaximumLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1651,7 +1651,7 @@ void VCartesianAxis::updatePositions()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1752,7 +1752,7 @@ void VCartesianAxis::createShapes()
if( !prepareShapeCreation() )
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 9321ec109678..091d61718a60 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -67,7 +67,7 @@ void VCartesianCoordinateSystem::createGridShapes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
{
@@ -77,15 +77,15 @@ void VCartesianCoordinateSystem::createGridShapes()
continue;
VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis ));
- aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex)
- , this->getExplicitIncrement(nDimensionIndex,nAxisIndex) );
+ aGrid.setExplicitScaleAndIncrement( getExplicitScale(nDimensionIndex,nAxisIndex)
+ , getExplicitIncrement(nDimensionIndex,nAxisIndex) );
aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );
aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
- , this->createCIDForGrid( nDimensionIndex,nAxisIndex ) );
+ , createCIDForGrid( nDimensionIndex,nAxisIndex ) );
if(nDimensionCount==2)
aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- aGrid.setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
+ aGrid.setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
aGrid.createShapes();
}
}
@@ -104,7 +104,7 @@ void VCartesianCoordinateSystem::createVAxisList(
m_aAxisMap.clear();
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
if(nDimensionCount<=0)
return;
@@ -118,11 +118,11 @@ void VCartesianCoordinateSystem::createVAxisList(
sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex);
for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ )
{
- Reference< XAxis > xAxis = this->getAxisByDimension(nDimensionIndex,nAxisIndex);
+ Reference< XAxis > xAxis = getAxisByDimension(nDimensionIndex,nAxisIndex);
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
- AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider());
+ AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider());
aAxisProperties.m_nDimensionIndex = nDimensionIndex;
aAxisProperties.m_bSwapXAndY = bSwapXAndY;
aAxisProperties.m_bIsMainAxis = (nAxisIndex==0);
@@ -146,7 +146,7 @@ void VCartesianCoordinateSystem::createVAxisList(
}
aAxisProperties.init(true);
if(aAxisProperties.m_bDisplayLabels)
- aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
+ aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc);
std::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
@@ -164,7 +164,7 @@ void VCartesianCoordinateSystem::initVAxisInList()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -175,12 +175,12 @@ void VCartesianCoordinateSystem::initVAxisInList()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
- pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
+ pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
- , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) );
+ , createCIDForAxis( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
+ pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
}
}
}
@@ -191,7 +191,7 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -202,10 +202,10 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
- pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
+ pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
+ pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
}
}
}
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 57073235c0ff..aa71888bd9f3 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -200,7 +200,7 @@ void VCartesianGrid::createShapes()
//create named group shape
Reference< drawing::XShapes > xGroupShape_Shapes(
- this->createGroupShape( m_xLogicTarget, m_aCID ) );
+ createGroupShape( m_xLogicTarget, m_aCID ) );
if(!xGroupShape_Shapes.is())
return;
@@ -209,7 +209,7 @@ void VCartesianGrid::createShapes()
fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create all scaled tickmark values
- std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
TickFactory& aTickFactory = *apTickFactory.get();
TickInfoArraysType aAllTickInfos;
aTickFactory.getAllTicks( aAllTickInfos );
@@ -232,7 +232,7 @@ void VCartesianGrid::createShapes()
Reference< drawing::XShapes > xTarget( xGroupShape_Shapes );
if( nDepth > 0 )
{
- xTarget.set( this->createGroupShape( m_xLogicTarget
+ xTarget.set( createGroupShape( m_xLogicTarget
, ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
) );
if(!xTarget.is())
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index bf409b8341b1..741516b7159c 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -178,7 +178,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
if( nYResolution < 10 )
nYResolution = 10;
- if( this->getPropertySwapXAndYAxis() )
+ if( getPropertySwapXAndYAxis() )
std::swap(nXResolution,nYResolution);
//2D
@@ -232,7 +232,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex
{
impl_adjustDimension( rDimensionIndex );
- if( rAxisIndex < 0 || rAxisIndex > this->getMaximumAxisIndexByDimension(rDimensionIndex) )
+ if( rAxisIndex < 0 || rAxisIndex > getMaximumAxisIndexByDimension(rDimensionIndex) )
rAxisIndex = 0;
}
@@ -251,7 +251,7 @@ std::vector< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32
std::vector< ExplicitScaleData > aRet(m_aExplicitScales);
impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
- aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex );
+ aRet[nDimensionIndex]=getExplicitScale( nDimensionIndex, nAxisIndex );
return aRet;
}
@@ -261,7 +261,7 @@ std::vector< ExplicitIncrementData > VCoordinateSystem::getExplicitIncrements( s
std::vector< ExplicitIncrementData > aRet(m_aExplicitIncrements);
impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
- aRet[nDimensionIndex]=this->getExplicitIncrement( nDimensionIndex, nAxisIndex );
+ aRet[nDimensionIndex]=getExplicitIncrement( nDimensionIndex, nAxisIndex );
return aRet;
}
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 8d58afb19212..f8796f4a29e0 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -164,13 +164,13 @@ void VPolarAngleAxis::createLabels()
if( m_aAxisProperties.m_bDisplayLabels )
{
//get the transformed screen values for all tickmarks in aAllTickInfos
- std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
//create tick mark text shapes
//@todo: iterate through all tick depth which should be labeled
EquidistantTickIter aTickIter( m_aAllTickInfos, m_aIncrement, 0 );
- this->updateUnscaledValuesAtTicks( aTickIter );
+ updateUnscaledValuesAtTicks( aTickIter );
removeTextShapesFromTicks();
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 732157432d21..3928b5b07c9f 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -46,7 +46,7 @@ uno::Sequence< sal_Int32 > VPolarCoordinateSystem::getCoordinateSystemResolution
if( aResolution.getLength() >= 2 )
{
- if( this->getPropertySwapXAndYAxis() )
+ if( getPropertySwapXAndYAxis() )
{
aResolution[0]/=2;//radius
aResolution[1]*=4;//outer circle resolution
@@ -82,13 +82,13 @@ void VPolarCoordinateSystem::createVAxisList(
sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex);
for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ )
{
- Reference< XAxis > xAxis( this->getAxisByDimension(nDimensionIndex,nAxisIndex) );
+ Reference< XAxis > xAxis( getAxisByDimension(nDimensionIndex,nAxisIndex) );
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
- AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider());
+ AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider());
aAxisProperties.init();
if(aAxisProperties.m_bDisplayLabels)
- aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
+ aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc);
std::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
@@ -105,7 +105,7 @@ void VPolarCoordinateSystem::initVAxisInList()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -116,15 +116,15 @@ void VPolarCoordinateSystem::initVAxisInList()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
- pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
+ pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) );
pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
- , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) );
+ , createCIDForAxis( nDimensionIndex, nAxisIndex ) );
VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
if( pVPolarAxis )
- pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
+ pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
+ pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
}
}
}
@@ -135,7 +135,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -146,13 +146,13 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
- pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
+ pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) );
VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
if( pVPolarAxis )
- pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
+ pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
+ pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
}
}
}
@@ -163,7 +163,7 @@ void VPolarCoordinateSystem::createGridShapes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
- bool bSwapXAndY = this->getPropertySwapXAndYAxis();
+ bool bSwapXAndY = getPropertySwapXAndYAxis();
for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
{
@@ -174,12 +174,12 @@ void VPolarCoordinateSystem::createGridShapes()
continue;
VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis ));
- aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
+ aGrid.setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
- , this->createCIDForGrid( nDimensionIndex, nAxisIndex ) );
+ , createCIDForGrid( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- aGrid.setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY );
+ aGrid.setScales( getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY );
aGrid.createShapes();
}
}
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 279f38c956f2..09e0d6a237f2 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -106,7 +106,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
, const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
- this->createGroupShape( xLogicTarget, m_aCID ) );
+ createGroupShape( xLogicTarget, m_aCID ) );
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
Reference< XScaling > xInverseScaling( NULL );
@@ -160,7 +160,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
, const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
- this->createGroupShape( xLogicTarget, m_aCID ) );
+ createGroupShape( xLogicTarget, m_aCID ) );
const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1];
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
@@ -182,7 +182,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
Reference< drawing::XShapes > xTarget( xMainTarget );
if( nDepth > 0 )
{
- xTarget.set( this->createGroupShape( xLogicTarget
+ xTarget.set( createGroupShape( xLogicTarget
, ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
) );
if(!xTarget.is())
@@ -238,9 +238,9 @@ void VPolarGrid::createShapes()
if(m_nDimension==2)
{
if(m_nDimensionIndex==1)
- this->create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
+ create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
//else //no Angle Grid so far as this equals exactly the y axis positions
- // this->create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
+ // create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
}
}
generated by cgit (git 2.34.1) at 2024-07-24 07:00:45 +0000