From c08b8e3144525b8c7424299bf6c8147727bf78eb Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 14 Mar 2011 17:36:17 -0500 Subject: 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 --- chart2/source/view/axes/VPolarAngleAxis.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chart2/source/view/axes') 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 -- cgit