revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

15 files changed, 29 insertions, 29 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 689ece847e94..69ac5871f21e 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -328,10 +328,10 @@ void lcl_CloneSubGrids(
         }
 
         (*pDestIt) = xSubGrid;
-        assert( pDestIt != pDestEnd );
+        OSL_ASSERT( pDestIt != pDestEnd );
         ++pDestIt;
     }
-    assert( pDestIt == pDestEnd );
+    OSL_ASSERT( pDestIt == pDestEnd );
     (void)(pDestEnd); // avoid warning
 }
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 38d8a470811d..38694dcdf0e2 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -228,7 +228,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension(
     if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() )
         throw lang::IndexOutOfBoundsException();
 
-    assert(m_aAllAxis.size() == static_cast< size_t >( getDimension()));
+    OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension()));
 
     if( nAxisIndex < 0 || nAxisIndex > this->getMaximumAxisIndexByDimension(nDimensionIndex) )
         throw lang::IndexOutOfBoundsException();
@@ -241,7 +241,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int
     if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() )
         throw lang::IndexOutOfBoundsException();
 
-    assert(m_aAllAxis.size() == static_cast< size_t >( getDimension()));
+    OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension()));
 
     sal_Int32 nRet = m_aAllAxis[ nDimensionIndex ].size();
     if(nRet)
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index c9a8bc6df1a1..834e05c9861c 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -521,7 +521,7 @@ void SAL_CALL ChartModel::load(
             }
             else
             {
-                assert( aMDHelper.ISSET_InputStream );
+                OSL_ASSERT( aMDHelper.ISSET_InputStream );
                 // convert XInputStream to XStorage via the storage factory
                 Sequence< uno::Any > aStorageArgs( 2 );
                 aStorageArgs[0] <<= aMDHelper.InputStream;
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 52f26a4e58d8..ec3e3cfe292d 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -196,7 +196,7 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast(
             ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder );
         }
 
-        assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
+        OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
         if( rValue.hasValue() &&
             (rValue >>= xBroadcaster) &&
             xBroadcaster.is())
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index eb2ee2dbdd3c..6eebded278cb 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -284,7 +284,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast(
             ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder );
         }
 
-        assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
+        OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
         if( rValue.hasValue() &&
             (rValue >>= xBroadcaster) &&
             xBroadcaster.is())
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index b2b7f34edea7..a43356152f7e 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -143,9 +143,9 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
             xSeries.set( aSeriesToReUse[nSeriesIndex] );
         else
             xSeries.set( new DataSeries );
-        assert( xSeries.is() );
+        OSL_ASSERT( xSeries.is() );
         Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
-        assert( xSink.is() );
+        OSL_ASSERT( xSink.is() );
         xSink->setData( comphelper::containerToSequence( aNewData ) );
 
         aSeriesVec.push_back( xSeries );
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 45a2f02dabbe..32cae2fa556c 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -304,7 +304,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
             ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder );
         }
 
-        assert( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
+        OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE );
         if( rValue.hasValue() &&
             (rValue >>= xBroadcaster) &&
             xBroadcaster.is())
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 1c69a470f298..c98d79760cf9 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -544,7 +544,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
 //               break;
 
             case TEMPLATE_NOT_FOUND:
-                assert(false);
+                OSL_ASSERT( false );
                 break;
         }
         xResult.set( xTemplate, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7458458d4047..cc7b5b833145 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -234,7 +234,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
             DiagramHelper::getChartTypesFromDiagram(xDiagram) );
 
         Reference< XCoordinateSystemContainer > xCoordSysCnt( xDiagram, uno::UNO_QUERY );
-        assert(xCoordSysCnt.is());
+        OSL_ASSERT( xCoordSysCnt.is());
         if( xCoordSysCnt.is())
         {
             Sequence< Reference< XCoordinateSystem > > aCooSysSeq(
@@ -466,7 +466,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
 
                 //iterate through all chart types in the current coordinate system
                 uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
-                assert(xChartTypeContainer.is());
+                OSL_ASSERT( xChartTypeContainer.is());
                 if( !xChartTypeContainer.is() )
                     continue;
                 uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
@@ -476,7 +476,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
 
                     //iterate through all series in this chart type
                     uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
-                    assert(xDataSeriesContainer.is());
+                    OSL_ASSERT( xDataSeriesContainer.is());
                     if( !xDataSeriesContainer.is() )
                         continue;
 
@@ -836,7 +836,7 @@ void ChartTypeTemplate::createChartTypes(
                 else
                 {
                     // reuse existing chart type
-                    assert(xCT.is());
+                    OSL_ASSERT( xCT.is());
                     Reference< chart2::XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW );
                     Sequence< Reference< XDataSeries > > aNewSeriesSeq( xDSCnt->getDataSeries());
                     sal_Int32 nNewStartIndex = aNewSeriesSeq.getLength();
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index e2c0ddd29eee..f6dd85178eec 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -313,7 +313,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
             xColumnChartType.is() &&
             xLineChartType.is())
         {
-            assert(xColumnChartCooSys.is());
+            OSL_ASSERT( xColumnChartCooSys.is());
 
             // check stackmode of bars
             bResult = (xColumnChartCooSys->getDimension() == getDimension());
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 0e8917e1355c..f3000954d5ca 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -58,7 +58,7 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource(
     InterpretedData aResult(  DataInterpreter::interpretDataSource( xSource, aArguments, aSeriesToReUse ));
 
     // the base class should return one group
-    assert( aResult.Series.getLength() == 1 );
+    OSL_ASSERT( aResult.Series.getLength() == 1 );
     if( aResult.Series.getLength() == 1 )
     {
         sal_Int32 nNumberOfSeries = aResult.Series[0].getLength();
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index f67ccbc35e23..57f03562e85d 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -118,9 +118,9 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
             xSeries.set( aSeriesToReUse[nSeriesIndex] );
         else
             xSeries.set( new DataSeries );
-        assert( xSeries.is() );
+        OSL_ASSERT( xSeries.is() );
         Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
-        assert( xSink.is() );
+        OSL_ASSERT( xSink.is() );
         xSink->setData( aNewData );
 
         aSeriesVec.push_back( xSeries );
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index e2938628d8fa..bc29b89ac2b3 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -207,7 +207,7 @@ sal_Int32 StockChartTypeTemplate::getAxisCountByDimension( sal_Int32 nDimension
         return 0;
 
     // one or two y-axes depending on volume
-    assert( nDimension == 1 );
+    OSL_ASSERT( nDimension == 1 );
     bool bHasVolume = false;
     getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume;
     return bHasVolume ? 2 : 1;
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;
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 7c0e37e40b16..c0d05a60ca98 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -127,9 +127,9 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
             xSeries.set( aSeriesToReUse[nSeriesIndex] );
         else
             xSeries.set( new DataSeries );
-        assert( xSeries.is() );
+        OSL_ASSERT( xSeries.is() );
         Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
-        assert( xSink.is() );
+        OSL_ASSERT( xSink.is() );
         xSink->setData( comphelper::containerToSequence( aNewData ) );
 
         aSeriesVec.push_back( xSeries );