diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /chart2/source/model/template/StockDataInterpreter.cxx | |
| parent | tdf#43157: convert sd module away from OSL_ASSERT to assert (diff) | |
| download | core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.tar.gz core-97eb00c75e173d4c8d0b483a7941ad3d2f23783e.zip | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'chart2/source/model/template/StockDataInterpreter.cxx')
| -rw-r--r-- | chart2/source/model/template/StockDataInterpreter.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index c3169299ba6b..b1844f1da84a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -170,9 +170,9 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // 3. create series with remaining sequences if( bHasVolume && nRemaining > 1 ) { - assert( nVolumeSeries > nNumOfFullSeries ); + OSL_ASSERT( nVolumeSeries > nNumOfFullSeries ); aSequences[nBarGroupIndex][nVolumeSeries - 1].realloc( 1 ); - assert( nDataCount > nSourceIndex ); + OSL_ASSERT( nDataCount > nSourceIndex ); if( aData[nSourceIndex].is()) SetRole( aData[nSourceIndex]->getValues(), "values-y"); aSequences[nBarGroupIndex][nVolumeSeries - 1][0].set( aData[nSourceIndex] ); @@ -184,10 +184,10 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // candle-stick if( nRemaining > 0 ) { - assert( nCandleStickSeries > nNumOfFullSeries ); + OSL_ASSERT( nCandleStickSeries > nNumOfFullSeries ); const sal_Int32 nSeriesIndex = nCandleStickSeries - 1; aSequences[nCandleStickGroupIndex][nSeriesIndex].realloc( nRemaining ); - assert( nDataCount > nSourceIndex ); + OSL_ASSERT( nDataCount > nSourceIndex ); // 1. low sal_Int32 nSeqIdx( 0 ); @@ -238,9 +238,9 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( xSeries.set( rSeriesToReUse[nReUsedSeriesIdx] ); else xSeries.set( new DataSeries ); - assert( xSeries.is() ); + OSL_ASSERT( xSeries.is() ); Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY_THROW ); - assert( xSink.is() ); + OSL_ASSERT( xSink.is() ); xSink->setData( aSequences[nGroupIndex][nSeriesIdx] ); aResultSeries[nGroupIndex][nSeriesIdx].set( xSeries ); } @@ -289,7 +289,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( // 2. b. candlestick { - assert(aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0)); + OSL_ASSERT( aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0)); Sequence< Reference< XDataSeries > > aSeries( aInterpretedData.Series[(bHasVolume ? 1 : 0)] ); if(!aSeries.getLength()) return false; |