diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-14 17:36:17 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-14 17:37:24 -0500 |
| commit | d5df21964afb12e84868e76c02530b19bedc9ac0 (patch) | |
| tree | 079bd1c66efcf6d5b10e1ded41a62df7e99bf09c /chart2 | |
| parent | 5b8875f0a5a0a167aba80731a2a260e696b57b82 (diff) | |
mis-merge: a declaration was moved due to cppcheck, and also changed value
the result is the 2 decalration were in the merge result, the
one with the 'bad' value shadowing the 'good' value
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/axes/VPolarAngleAxis.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 6d64e9e2a..d1505dade 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -179,7 +179,6 @@ void VPolarAngleAxis::createLabels() return; double fLogicRadius = m_pPosHelper->getOuterLogicRadius(); - double fLogicZ = 1.0;//as defined if( m_aAxisProperties.m_bDisplayLabels ) { @@ -197,7 +196,7 @@ void VPolarAngleAxis::createLabels() AxisLabelProperties aAxisLabelProperties( m_aAxisLabelProperties ); aAxisLabelProperties.bOverlapAllowed = true; - double fLogicZ = -0.5;//as defined + double fLogicZ = 1.0;//as defined while( !createTextShapes_ForAngleAxis( m_xTextTarget, aTickIter , aAxisLabelProperties , fLogicRadius, fLogicZ |