[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - chart2/source

[Norbert Thiebaud]

 chart2/source/tools/InternalDataProvider.cxx |   10 +++++-----
 chart2/source/view/axes/VPolarAngleAxis.cxx  |    3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit bbca452dc05d1c1ff8ee0be996153849915edc23
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Mar 14 17:37:03 2011 -0500

    mis-merge: setComplexColumnLabel now takes vector of uno::Any

diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 5098e98..e2c269e 100755
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -516,7 +516,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
     if( aRangeRepresentation.indexOf('{') >= 0 )
     {
         ::std::vector< double > aNewData;
-        ::std::vector< OUString > aNewLabels;
+        ::std::vector< uno::Any > aNewLabels;
         OUString    aToken;
         sal_Int32   nCategories     = 0;
         sal_Int32   nIndex          = 0;
@@ -542,12 +542,12 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
             }
             else
             {
-                aNewLabels.push_back( aToken.replace('"', ' ').trim() );
+                aNewLabels.push_back( uno::makeAny(aToken.replace('"', ' ').trim()) );
                 if( !nCategories &&
                    ( !m_aInternalData.getComplexColumnLabel(n).size() ||
-                     !m_aInternalData.getComplexColumnLabel(n).front().getLength() ) )
+                     !m_aInternalData.getComplexColumnLabel(n).front().hasValue() ) )
                 {
-                    m_aInternalData.setComplexColumnLabel( n, aNewLabels );
+                    m_aInternalData.setComplexColumnLabel( n,  aNewLabels );
                     bLabelSet = true;
                 }
                 else
@@ -555,7 +555,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
                     m_aInternalData.setComplexRowLabel(nCategories, aNewLabels);
                     if(nCategories==1 && bLabelSet)
                     {
-                        ::std::vector< OUString > aLabels;
+                        ::std::vector< uno::Any > aLabels;
                         m_aInternalData.setComplexRowLabel( 0, m_aInternalData.getComplexColumnLabel( n ) );
                         m_aInternalData.setComplexColumnLabel( n, aLabels );
                     }
commit d5df21964afb12e84868e76c02530b19bedc9ac0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Mar 14 17:36:17 2011 -0500

    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

diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 6d64e9e..d1505da 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