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 | c08b8e3144525b8c7424299bf6c8147727bf78eb (patch) | |
| tree | ad7fda4f86e1f349d0f50986598084e74e4f2b75 /chart2 | |
| parent | ea62c27ed1cd9aed3a04bb26ef5206ef1fa6d0a2 (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 f5469c366358..ae4535ca20f4 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 |