diff options
Diffstat (limited to 'chart2/source/view/axes/Tickmarks.cxx')
| -rw-r--r-- | chart2/source/view/axes/Tickmarks.cxx | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 73c8e041cf40..c30f2f25d5e5 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -24,18 +24,19 @@ #include "VAxisProperties.hxx" #include <osl/diagnose.h> #include <com/sun/star/chart2/AxisType.hpp> +#include <utility> using namespace ::com::sun::star; using ::basegfx::B2DVector; namespace chart { -TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse ) +TickInfo::TickInfo( uno::Reference<chart2::XScaling> xInverse ) : fScaledTickValue( 0.0 ) -, xInverseScaling( xInverse ) +, xInverseScaling(std::move( xInverse )) , aTickScreenPosition(0.0,0.0) -, bPaintIt( true ) , nFactorForLimitedTextWidth(1) +, bPaintIt( true ) { } @@ -85,9 +86,9 @@ TickInfo* PureTickIter::nextInfo() } TickFactory::TickFactory( - const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) - : m_rScale( rScale ) - , m_rIncrement( rIncrement ) + ExplicitScaleData aScale, ExplicitIncrementData aIncrement ) + : m_rScale(std::move( aScale )) + , m_rIncrement(std::move( aIncrement )) { //@todo: make sure that the scale is valid for the scaling @@ -175,7 +176,7 @@ bool TickFactory2D::isHorizontalAxis() const // for skew axes compare angle with horizontal vector double fInclination = std::abs(B2DVector(m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D).angle(B2DVector(1.0, 0.0))); - return fInclination < F_PI4 || fInclination > (F_PI-F_PI4); + return fInclination < M_PI_4 || fInclination > (M_PI-M_PI_4); } bool TickFactory2D::isVerticalAxis() const { @@ -187,7 +188,7 @@ bool TickFactory2D::isVerticalAxis() const // for skew axes compare angle with vertical vector double fInclination = std::abs(B2DVector(m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D).angle(B2DVector(0.0, -1.0))); - return fInclination < F_PI4 || fInclination > (F_PI-F_PI4); + return fInclination < M_PI_4 || fInclination > (M_PI-M_PI_4); } //static sal_Int32 TickFactory2D::getTickScreenDistance( TickIter& rIter ) @@ -203,11 +204,6 @@ sal_Int32 TickFactory2D::getTickScreenDistance( TickIter& rIter ) return pFirstTickInfo->getScreenDistanceBetweenTicks( *pSecondTickInfo ); } -const B2DVector & TickFactory2D::getXaxisStartPos() const -{ - return m_aAxisStartScreenPosition2D; -} - B2DVector TickFactory2D::getTickScreenPosition2D( double fScaledLogicTickValue ) const { B2DVector aRet(m_aAxisStartScreenPosition2D); @@ -238,11 +234,9 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence& B2DVector aStart = aTickScreenPosition + aOrthoDirection*rTickmarkProperties.RelativePos; B2DVector aEnd = aStart - aOrthoDirection*rTickmarkProperties.Length; - rPoints[nSequenceIndex].realloc(2); - rPoints[nSequenceIndex][0].X = static_cast<sal_Int32>(aStart.getX()); - rPoints[nSequenceIndex][0].Y = static_cast<sal_Int32>(aStart.getY()); - rPoints[nSequenceIndex][1].X = static_cast<sal_Int32>(aEnd.getX()); - rPoints[nSequenceIndex][1].Y = static_cast<sal_Int32>(aEnd.getY()); + rPoints.getArray()[nSequenceIndex] + = { { static_cast<sal_Int32>(aStart.getX()), static_cast<sal_Int32>(aStart.getY()) }, + { static_cast<sal_Int32>(aEnd.getX()), static_cast<sal_Int32>(aEnd.getY()) } }; } B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisProperties, bool bIncludeFarAwayDistanceIfSo, bool bIncludeSpaceBetweenTickAndText ) const @@ -300,11 +294,10 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisP void TickFactory2D::createPointSequenceForAxisMainLine( drawing::PointSequenceSequence& rPoints ) const { - rPoints[0].realloc(2); - rPoints[0][0].X = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getX()); - rPoints[0][0].Y = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getY()); - rPoints[0][1].X = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getX()); - rPoints[0][1].Y = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getY()); + rPoints.getArray()[0] = { { static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getX()), + static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getY()) }, + { static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getX()), + static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getY()) } }; } void TickFactory2D::updateScreenValues( TickInfoArraysType& rAllTickInfos ) const |