diff options
| author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-16 16:39:11 +0100 |
|---|---|---|
| committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-16 16:39:11 +0100 |
| commit | d536f34a8d7c0cf5360690a428d0a07143aac708 (patch) | |
| tree | 2d5f3bdd9795c20de462c4f235a07970c929613f /xmloff | |
| parent | b118e8602aa34e14191fd7149b804f7ae77ad796 (diff) | |
chart51: merge with DEV300_m100 - part 2
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index dbbedc09f751..2f1c9adcfc74 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -838,7 +838,6 @@ lcl_TableData lcl_getDataForLocalTable( tStringVector& rCategories = bSeriesFromColumns ? aResult.aRowDescriptions : aResult.aColumnDescriptions; tStringVector& rLabels = bSeriesFromColumns ? aResult.aColumnDescriptions : aResult.aRowDescriptions; - Sequence< Sequence< OUString > >& rComplexLabels = bSeriesFromColumns ? aResult.aComplexColumnDescriptions : aResult.aComplexRowDescriptions;//#i116544# //categories lcl_SequenceToVector( aSimpleCategories, rCategories ); @@ -855,10 +854,11 @@ lcl_TableData lcl_getDataForLocalTable( // iterate over all sequences size_t nSeqIdx = 0; + Sequence< Sequence< OUString > > aComplexLabels; for( ; aIt != aEnd; ++aIt, ++nSeqIdx ) { OUString aRange; - Sequence< OUString >& rCurrentComplexLabel = rComplexLabels[nSeqIdx]; + Sequence< OUString >& rCurrentComplexLabel = aComplexLabels[nSeqIdx]; if( aIt->first.is()) { lcl_getLabelStringSequence( rCurrentComplexLabel, aIt->first ); @@ -900,6 +900,16 @@ lcl_TableData lcl_getDataForLocalTable( if( !lcl_SequenceHasUnhiddenData(aIt->first) && !lcl_SequenceHasUnhiddenData(aIt->second) ) aResult.aHiddenColumns.push_back(nSeqIdx); } + Sequence< Sequence< Any > >& rComplexAnyLabels = bSeriesFromColumns ? aResult.aComplexColumnDescriptions : aResult.aComplexRowDescriptions;//#i116544# + rComplexAnyLabels.realloc(aComplexLabels.getLength()); + for( sal_Int32 nN=0; nN<aComplexLabels.getLength();nN++ ) + { + Sequence< OUString >& rSource = aComplexLabels[nN]; + Sequence< Any >& rTarget = rComplexAnyLabels[nN]; + rTarget.realloc( rSource.getLength() ); + for( sal_Int32 i=0; i<rSource.getLength(); i++ ) + rTarget[i] = uno::makeAny( rSource[i] ); + } } catch( uno::Exception & rEx ) { |