summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes/Tickmarks_Equidistant.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/axes/Tickmarks_Equidistant.cxx')
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index d678b58e56ad..60f6e63311ad 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -105,23 +105,23 @@ EquidistantTickFactory::EquidistantTickFactory(
m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
- if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
+ if(!(!m_rIncrement.PostEquidistant && m_xInverseScaling.is()) )
+ return;
+
+ m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
+ m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
+
+ //check validity of new range: m_fOuterMajorTickBorderMin <-> m_fOuterMajorTickBorderMax
+ //it is assumed here, that the original range in the given Scale is valid
+ if( !std::isfinite(m_fOuterMajorTickBorderMin_Scaled) )
{
+ m_fOuterMajorTickBorderMin += m_rIncrement.Distance;
m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
+ }
+ if( !std::isfinite(m_fOuterMajorTickBorderMax_Scaled) )
+ {
+ m_fOuterMajorTickBorderMax -= m_rIncrement.Distance;
m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
-
- //check validity of new range: m_fOuterMajorTickBorderMin <-> m_fOuterMajorTickBorderMax
- //it is assumed here, that the original range in the given Scale is valid
- if( !std::isfinite(m_fOuterMajorTickBorderMin_Scaled) )
- {
- m_fOuterMajorTickBorderMin += m_rIncrement.Distance;
- m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
- }
- if( !std::isfinite(m_fOuterMajorTickBorderMax_Scaled) )
- {
- m_fOuterMajorTickBorderMax -= m_rIncrement.Distance;
- m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
- }
}
}