diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-14 17:37:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-14 17:37:24 -0500 |
| commit | bbca452dc05d1c1ff8ee0be996153849915edc23 (patch) | |
| tree | a713a6dde842cdfb96a1bd2217e0203d9d77ae1d /chart2 | |
| parent | d5df21964afb12e84868e76c02530b19bedc9ac0 (diff) | |
mis-merge: setComplexColumnLabel now takes vector of uno::Any
Diffstat (limited to 'chart2')
| -rwxr-xr-x | chart2/source/tools/InternalDataProvider.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 5098e988a..e2c269e63 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 ); } |