diff options
Diffstat (limited to 'chart2/source/view/axes/VCartesianAxis.cxx')
| -rw-r--r-- | chart2/source/view/axes/VCartesianAxis.cxx | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 111982dbf2d2..51cb01697e08 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -556,12 +556,16 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo VAxisBase::createAllTickInfos(rAllTickInfos); } +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel ) { if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) ) return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) ); return ::std::auto_ptr< TickIter >(); } +SAL_WNODEPRECATED_DECLARATIONS_POP + +SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel ) { if( isComplexCategoryAxis() || isDateAxis() ) @@ -581,6 +585,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo } return ::std::auto_ptr< TickIter >(); } +SAL_WNODEPRECATED_DECLARATIONS_POP sal_Int32 VCartesianAxis::getTextLevelCount() const { @@ -1330,7 +1335,9 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel B2DVector aCummulatedLabelsDistance(0,0); for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel ); + SAL_WNODEPRECATED_DECLARATIONS_POP if(apTickIter.get()) { double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree; @@ -1368,7 +1375,9 @@ void VCartesianAxis::createLabels() //create labels if( m_aAxisProperties.m_bDisplayLabels ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() ); + SAL_WNODEPRECATED_DECLARATIONS_POP TickFactory_2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1387,7 +1396,9 @@ void VCartesianAxis::createLabels() sal_Int32 nScreenDistanceBetweenTicks = -1; for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel ); + SAL_WNODEPRECATED_DECLARATIONS_POP if(apTickIter.get()) { if(nTextLevel==0) @@ -1434,7 +1445,9 @@ void VCartesianAxis::createMaximumLabels() //create labels if( m_aAxisProperties.m_bDisplayLabels ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() ); + SAL_WNODEPRECATED_DECLARATIONS_POP TickFactory_2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1454,7 +1467,9 @@ void VCartesianAxis::createMaximumLabels() sal_Int32 nTextLevelCount = getTextLevelCount(); for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > apTickIter = createMaximumLabelTickIterator( nTextLevel ); + SAL_WNODEPRECATED_DECLARATIONS_POP if(apTickIter.get()) { while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) ) @@ -1472,7 +1487,9 @@ void VCartesianAxis::updatePositions() //update positions of labels if( m_aAxisProperties.m_bDisplayLabels ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() ); + SAL_WNODEPRECATED_DECLARATIONS_POP TickFactory_2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1569,7 +1586,9 @@ void VCartesianAxis::createShapes() if( !prepareShapeCreation() ) return; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() ); + SAL_WNODEPRECATED_DECLARATIONS_POP TickFactory_2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1593,7 +1612,9 @@ void VCartesianAxis::createShapes() sal_Int32 nTextLevelCount = getTextLevelCount(); for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel ); + SAL_WNODEPRECATED_DECLARATIONS_POP if( apTickIter.get() ) { double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree; |