diff options
Diffstat (limited to 'chart2/source/model/template/DataInterpreter.cxx')
| -rw-r--r-- | chart2/source/model/template/DataInterpreter.cxx | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 6d5b85fd3e4b..b619553ee959 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -149,7 +149,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( Sequence< Sequence< Reference< XDataSeries > > > aSeries(1); aSeries[0] = ContainerToSequence( aSeriesVec ); - return InterpretedData( aSeries, xCategories, Sequence< Reference< data::XLabeledDataSequence > >() ); + return InterpretedData( aSeries, xCategories ); } InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( @@ -157,8 +157,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( throw (uno::RuntimeException) { InterpretedData aResult( aInterpretedData ); - vector< Reference< data::XLabeledDataSequence > > aUnused( - SequenceToVector( aInterpretedData.UnusedData )); sal_Int32 i=0; Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); @@ -190,14 +188,14 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences()); if( aSeqs.getLength() != aNewSequences.getLength() ) { +#if OSL_DEBUG_LEVEL > 1 sal_Int32 j=0; for( ; j<aSeqs.getLength(); ++j ) { - if( aSeqs[j] != xValuesY ) - aUnused.push_back( aSeqs[j] ); + OSL_ENSURE( aSeqs[j] == xValuesY, "All sequences should be used" ); } +#endif Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW ); - xSink->setData( aNewSequences ); } } @@ -207,8 +205,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( } } - aResult.UnusedData = ContainerToSequence( aUnused ); - return aResult; } @@ -294,34 +290,13 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData( throw (uno::RuntimeException) { vector< Reference< data::XLabeledDataSequence > > aResultVec; - vector< Reference< data::XLabeledDataSequence > > aUnusedDataVec; aResultVec.reserve( aInterpretedData.Series.getLength() + - aInterpretedData.UnusedData.getLength() + 1 // categories ); if( aInterpretedData.Categories.is()) aResultVec.push_back( aInterpretedData.Categories ); - // add unused data that has the Role categories at front - if( aInterpretedData.UnusedData.getLength()) - { - sal_Int32 nSize = aInterpretedData.UnusedData.getLength(); - for( sal_Int32 i=0; i<nSize; ++i ) - { - Reference< data::XLabeledDataSequence > xPotentialCategories( aInterpretedData.UnusedData[i] ); - if( xPotentialCategories.is() ) - { - if( GetRole( xPotentialCategories->getValues()).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("categories"))) - aResultVec.push_back( xPotentialCategories ); - else - aUnusedDataVec.push_back( xPotentialCategories ); - } - } - } - else - aUnusedDataVec = SequenceToVector( aInterpretedData.UnusedData ); - Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeries.getLength(); ++nSeriesIdx ) { @@ -349,9 +324,6 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData( } } - // add unused data at end - copy( aUnusedDataVec.begin(), aUnusedDataVec.end(), back_inserter( aResultVec )); - return Reference< data::XDataSource >( DataSourceHelper::createDataSource( ContainerToSequence( aResultVec ) ) ); } |