diff options
Diffstat (limited to 'chart2/source/view')
23 files changed, 174 insertions, 174 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 ); } } 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 diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 613c4b5ac246..0eaab2eb4155 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -148,7 +148,7 @@ uno::Reference< uno::XInterface > DrawModelWrapper::createUnoModel() uno::Reference< frame::XModel > DrawModelWrapper::getUnoModel() { - uno::Reference< uno::XInterface > xI = this->SdrModel::getUnoModel(); + uno::Reference< uno::XInterface > xI = SdrModel::getUnoModel(); return uno::Reference<frame::XModel>::query( xI ); } @@ -159,7 +159,7 @@ SdrModel& DrawModelWrapper::getSdrModel() uno::Reference< lang::XMultiServiceFactory > DrawModelWrapper::getShapeFactory() { - uno::Reference< lang::XMultiServiceFactory > xShapeFactory( this->getUnoModel(), uno::UNO_QUERY ); + uno::Reference< lang::XMultiServiceFactory > xShapeFactory( getUnoModel(), uno::UNO_QUERY ); return xShapeFactory; } @@ -189,14 +189,14 @@ uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getMainDrawPage() //ensure that additional shapes are in front of the chart objects so create the chart root before // let us disable this call for now // TODO:moggi - // AbstractShapeFactory::getOrCreateShapeFactory(this->getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage ); + // AbstractShapeFactory::getOrCreateShapeFactory(getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage ); return m_xMainDrawPage; } uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getHiddenDrawPage() { if( !m_xHiddenDrawPage.is() ) { - uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( this->getUnoModel(), uno::UNO_QUERY ); + uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( getUnoModel(), uno::UNO_QUERY ); if( xDrawPagesSuplier.is() ) { uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSuplier->getDrawPages () ); @@ -240,13 +240,13 @@ uno::Reference< drawing::XShapes > DrawModelWrapper::getChartRootShape( void DrawModelWrapper::lockControllers() { - uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() ); + uno::Reference< frame::XModel > xDrawModel( getUnoModel() ); if( xDrawModel.is()) xDrawModel->lockControllers(); } void DrawModelWrapper::unlockControllers() { - uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() ); + uno::Reference< frame::XModel > xDrawModel( getUnoModel() ); if( xDrawModel.is()) xDrawModel->unlockControllers(); } @@ -258,36 +258,36 @@ OutputDevice* DrawModelWrapper::getReferenceDevice() const SfxItemPool& DrawModelWrapper::GetItemPool() { - return this->SdrModel::GetItemPool(); + return SdrModel::GetItemPool(); } XColorListRef DrawModelWrapper::GetColorList() const { - return this->SdrModel::GetColorList(); + return SdrModel::GetColorList(); } XDashListRef DrawModelWrapper::GetDashList() const { - return this->SdrModel::GetDashList(); + return SdrModel::GetDashList(); } XLineEndListRef DrawModelWrapper::GetLineEndList() const { - return this->SdrModel::GetLineEndList(); + return SdrModel::GetLineEndList(); } XGradientListRef DrawModelWrapper::GetGradientList() const { - return this->SdrModel::GetGradientList(); + return SdrModel::GetGradientList(); } XHatchListRef DrawModelWrapper::GetHatchList() const { - return this->SdrModel::GetHatchList(); + return SdrModel::GetHatchList(); } XBitmapListRef DrawModelWrapper::GetBitmapList() const { - return this->SdrModel::GetBitmapList(); + return SdrModel::GetBitmapList(); } XPatternListRef DrawModelWrapper::GetPatternList() const { - return this->SdrModel::GetPatternList(); + return SdrModel::GetPatternList(); } SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName ) diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index f378e32a4b73..b42346c1210a 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -87,7 +87,7 @@ PlottingPositionHelper* PlottingPositionHelper::clone() const PlottingPositionHelper* PlottingPositionHelper::createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ) { - PlottingPositionHelper* pRet = this->clone(); + PlottingPositionHelper* pRet = clone(); pRet->m_aScales[1]=rSecondaryScale; return pRet; } @@ -175,23 +175,23 @@ uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScale drawing::Position3D PlottingPositionHelper::transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const { - this->doLogicScaling( &fX,&fY,&fZ ); + doLogicScaling( &fX,&fY,&fZ ); if(bClip) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); - return this->transformScaledLogicToScene( fX, fY, fZ, false ); + return transformScaledLogicToScene( fX, fY, fZ, false ); } drawing::Position3D PlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if( bClip ) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); drawing::Position3D aPos( fX, fY, fZ); uno::Reference< XTransformation > xTransformation = - this->getTransformationScaledLogicToScene(); + getTransformationScaledLogicToScene(); uno::Sequence< double > aSeq = xTransformation->transform( Position3DToSequence(aPos) ); return SequenceToPosition3D(aSeq); @@ -233,7 +233,7 @@ void PlottingPositionHelper::transformScaledLogicToScene( drawing::PolyPolygonSh double& fX = xValues[nP]; double& fY = yValues[nP]; double& fZ = zValues[nP]; - aScenePosition = this->transformScaledLogicToScene( fX,fY,fZ,true ); + aScenePosition = transformScaledLogicToScene( fX,fY,fZ,true ); fX = aScenePosition.PositionX; fY = aScenePosition.PositionY; fZ = aScenePosition.PositionZ; @@ -412,8 +412,8 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu fStartLogicValueOnAngleAxis = fHelp; } - double fStartAngleDegree = this->transformToAngleDegree( fStartLogicValueOnAngleAxis ); - double fEndAngleDegree = this->transformToAngleDegree( fEndLogicValueOnAngleAxis ); + double fStartAngleDegree = transformToAngleDegree( fStartLogicValueOnAngleAxis ); + double fEndAngleDegree = transformToAngleDegree( fEndLogicValueOnAngleAxis ); double fWidthAngleDegree = fEndAngleDegree - fStartAngleDegree; if( ::rtl::math::approxEqual( fStartAngleDegree, fEndAngleDegree ) @@ -598,19 +598,19 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu drawing::Position3D PolarPlottingPositionHelper::transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if(bClip) - this->clipLogicValues( &fX,&fY,&fZ ); + clipLogicValues( &fX,&fY,&fZ ); double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX; double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY; - return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ ); + return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ ); } drawing::Position3D PolarPlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if(bClip) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX; double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY; - return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false ); + return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false ); } drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius , double fLogicZ ) const @@ -629,8 +629,8 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling ) const { - double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); - double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); + double fUnitAngleDegree = transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); + double fUnitRadius = transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ ); } diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index a5d266f545ea..d7a71d605557 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -77,7 +77,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi else fRadius = fUnitCircleInnerRadius + (fUnitCircleOuterRadius-fUnitCircleInnerRadius)/2.0 ; - awt::Point aRet( this->transformSceneToScreenPosition( + awt::Point aRet( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) ); if(m_nDimensionCount==3 && nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE) @@ -85,10 +85,10 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi //check whether the upper or the downer edge is more distant from the center //take the farest point to put the label to - awt::Point aP0( this->transformSceneToScreenPosition( + awt::Point aP0( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0, 0, fLogicZ ) ) ); awt::Point aP1(aRet); - awt::Point aP2( this->transformSceneToScreenPosition( + awt::Point aP2( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ-0.5 ) ) ); ::basegfx::B2DVector aV0( aP0.X, aP0.Y ); @@ -158,7 +158,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi //add a scaling independent Offset if requested if( nScreenValueOffsetInRadiusDirection != 0) { - awt::Point aOrigin( this->transformSceneToScreenPosition( + awt::Point aOrigin( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0.0, 0.0, fLogicZ+0.5 ) ) ); basegfx::B2IVector aDirection( aRet.X- aOrigin.X, aRet.Y- aOrigin.Y ); aDirection.setLength(nScreenValueOffsetInRadiusDirection); diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 1c9f6061ef9b..09c8236840a9 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -572,7 +572,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce { OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); bool bHasNumberFormat = false; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); sal_Int32 nNumberFormat = -1; if( xPointProp.is() && (xPointProp->getPropertyValue(aPropName) >>= nNumberFormat) ) bHasNumberFormat = true; @@ -582,7 +582,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor { OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); sal_Int32 nNumberFormat = -1; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) xPointProp->getPropertyValue(aPropName) >>= nNumberFormat; return nNumberFormat; @@ -625,7 +625,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe sal_Int32 nLabelPlacement=0; try { - uno::Reference< beans::XPropertySet > xPointProps( this->getPropertiesOfPoint( nPointIndex ) ); + uno::Reference< beans::XPropertySet > xPointProps( getPropertiesOfPoint( nPointIndex ) ); if( xPointProps.is() ) xPointProps->getPropertyValue("LabelPlacement") >>= nLabelPlacement; @@ -807,7 +807,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const adaptPointCache( index ); if (!m_apSymbolProperties_AttributedPoint) m_apSymbolProperties_AttributedPoint - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfPoint(index)); + = getSymbolPropertiesFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apSymbolProperties_AttributedPoint.get(); //if a single data point does not have symbols but the dataseries itself has symbols //we create an invisible symbol shape to enable selection of that point @@ -815,7 +815,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const { if (!m_apSymbolProperties_Series) m_apSymbolProperties_Series - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries()); + = getSymbolPropertiesFromPropertySet(getPropertiesOfSeries()); if( m_apSymbolProperties_Series.get() && m_apSymbolProperties_Series->Style != SymbolStyle_NONE ) { if (!m_apSymbolProperties_InvisibleSymbolForSelection) @@ -835,7 +835,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const { if (!m_apSymbolProperties_Series) m_apSymbolProperties_Series - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries()); + = getSymbolPropertiesFromPropertySet(getPropertiesOfSeries()); pRet = m_apSymbolProperties_Series.get(); } @@ -856,7 +856,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getXErrorBarProperties( sal_I { uno::Reference< beans::XPropertySet > xErrorBarProp; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index )); if( xPointProp.is() ) xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp; return xErrorBarProp; @@ -866,7 +866,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getYErrorBarProperties( sal_I { uno::Reference< beans::XPropertySet > xErrorBarProp; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index )); if( xPointProp.is() ) xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp; return xErrorBarProp; @@ -879,7 +879,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const try { - uno::Reference< beans::XPropertyState > xPointState( this->getPropertiesOfPoint(index), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertyState > xPointState( getPropertiesOfPoint(index), uno::UNO_QUERY_THROW ); return (xPointState->getPropertyState("Color") != beans::PropertyState_DEFAULT_VALUE ); } catch(const uno::Exception& e) @@ -905,7 +905,7 @@ bool VDataSeries::isAttributedDataPoint( sal_Int32 index ) const bool VDataSeries::isVaryColorsByPoint() const { bool bVaryColorsByPoint = false; - Reference< beans::XPropertySet > xSeriesProp( this->getPropertiesOfSeries() ); + Reference< beans::XPropertySet > xSeriesProp( getPropertiesOfSeries() ); if( xSeriesProp.is() ) xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint; return bVaryColorsByPoint; @@ -915,7 +915,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int { if( isAttributedDataPoint( index ) ) return m_xDataSeries->getDataPointByIndex(index); - return this->getPropertiesOfSeries(); + return getPropertiesOfSeries(); } uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const @@ -958,14 +958,14 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const adaptPointCache( index ); if( !m_apLabel_AttributedPoint.get() ) m_apLabel_AttributedPoint - = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index)); + = getDataPointLabelFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apLabel_AttributedPoint.get(); } else { if (!m_apLabel_Series) m_apLabel_Series - = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index)); + = getDataPointLabelFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apLabel_Series.get(); } if( !m_bAllowPercentValueInDataLabel ) @@ -978,7 +978,7 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const DataPointLabel* VDataSeries::getDataPointLabelIfLabel( sal_Int32 index ) const { - DataPointLabel* pLabel = this->getDataPointLabel( index ); + DataPointLabel* pLabel = getDataPointLabel( index ); if( !pLabel || (!pLabel->ShowNumber && !pLabel->ShowNumberInPercent && !pLabel->ShowCategoryName ) ) return nullptr; @@ -1000,7 +1000,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index // Cache these properties for this point. m_apLabelPropNames_AttributedPoint.reset(new tNameSequence); m_apLabelPropValues_AttributedPoint.reset(new tAnySequence); - xTextProp.set( this->getPropertiesOfPoint( index )); + xTextProp.set( getPropertiesOfPoint( index )); PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *m_apLabelPropNames_AttributedPoint, *m_apLabelPropValues_AttributedPoint); bDoDynamicFontResize = true; @@ -1015,7 +1015,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index // Cache these properties for the whole series. m_apLabelPropNames_Series.reset(new tNameSequence); m_apLabelPropValues_Series.reset(new tAnySequence); - xTextProp.set( this->getPropertiesOfPoint( index )); + xTextProp.set( getPropertiesOfPoint( index )); PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *m_apLabelPropNames_Series, *m_apLabelPropValues_Series); bDoDynamicFontResize = true; diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 614770a199de..76cddf36f94c 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -29,10 +29,10 @@ using namespace ::com::sun::star; VLineProperties::VLineProperties() { - this->Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR - this->LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE - this->Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE - this->Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH + Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR + LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE + Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE + Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH } void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) @@ -41,11 +41,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert { try { - this->Color = xProp->getPropertyValue( "LineColor" ); - this->LineStyle = xProp->getPropertyValue( "LineStyle" ); - this->Transparence = xProp->getPropertyValue( "LineTransparence" ); - this->Width = xProp->getPropertyValue( "LineWidth" ); - this->DashName = xProp->getPropertyValue( "LineDashName" ); + Color = xProp->getPropertyValue( "LineColor" ); + LineStyle = xProp->getPropertyValue( "LineStyle" ); + Transparence = xProp->getPropertyValue( "LineTransparence" ); + Width = xProp->getPropertyValue( "LineWidth" ); + DashName = xProp->getPropertyValue( "LineDashName" ); } catch( const uno::Exception& e ) { @@ -53,7 +53,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert } } else - this->LineStyle <<= drawing::LineStyle_NONE; + LineStyle <<= drawing::LineStyle_NONE; } bool VLineProperties::isLineVisible() const @@ -61,11 +61,11 @@ bool VLineProperties::isLineVisible() const bool bRet = false; drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - this->LineStyle >>= aLineStyle; + LineStyle >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) { sal_Int16 nLineTransparence=0; - this->Transparence >>= nLineTransparence; + Transparence >>= nLineTransparence; if(nLineTransparence!=100) { bRet = true; |