revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

5 files changed, 16 insertions, 16 deletions

diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index e41664f4f018..4ba0b751ed3d 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -100,7 +100,7 @@ AxisItemConverter::AxisItemConverter(
         new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
 
     m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
-    assert(m_xAxis.is());
+    OSL_ASSERT( m_xAxis.is());
 }
 
 AxisItemConverter::~AxisItemConverter()
@@ -664,7 +664,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
                     if( ! aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() ||
                         aScale.IncrementData.SubIncrements[0].IntervalCount != aValue )
                     {
-                        assert(aValue.getValueTypeClass() == uno::TypeClass_LONG);
+                        OSL_ASSERT( aValue.getValueTypeClass() == uno::TypeClass_LONG );
                         aScale.IncrementData.SubIncrements[0].IntervalCount = aValue;
                         bSetScale = true;
                     }
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index c68666cf5941..b37123747c28 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -298,7 +298,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
                         {
                             // no data range for error bars yet => create
                             uno::Reference< chart2::XInternalDataProvider > xIntDataProvider( xDataProvider, uno::UNO_QUERY );
-                            assert(xIntDataProvider.is());
+                            OSL_ASSERT( xIntDataProvider.is());
                             if( xIntDataProvider.is())
                             {
                                 xIntDataProvider->appendSequence();
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 0a4e1cfed184..a462d20cf88f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -85,8 +85,8 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
     SfxItemPool & rPool = GetItemPool();
 
     assert(pRanges != nullptr);
-    assert(m_xPropertySetInfo.is());
-    assert(m_xPropertySet.is());
+    OSL_ASSERT( m_xPropertySetInfo.is());
+    OSL_ASSERT( m_xPropertySet.is());
 
     while( (*pRanges) != 0)
     {
@@ -95,7 +95,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
         sal_uInt16 nEnd = (*pRanges);
         ++pRanges;
 
-        assert(nBeg <= nEnd);
+        OSL_ASSERT( nBeg <= nEnd );
         for( sal_uInt16 nWhich = nBeg; nWhich <= nEnd; ++nWhich )
         {
             if( GetItemProperty( nWhich, aProperty ))
@@ -166,7 +166,7 @@ bool ItemConverter::ApplySpecialItem(
 
 bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 {
-    assert(m_xPropertySet.is());
+    OSL_ASSERT( m_xPropertySet.is());
 
     bool bItemsChanged = false;
     SfxItemIter aIter( rItemSet );
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index fd4b2f18b696..ef80018a7bb5 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -41,7 +41,7 @@ namespace
 template <class T, class D>
 bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue());
@@ -59,7 +59,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co
 template <class T, class D>
 void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue());
@@ -72,7 +72,7 @@ void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::R
 
 void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         double aValue = static_cast<const SvxDoubleItem&>(rItemSet.Get( nWhichId )).GetValue();
@@ -142,7 +142,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
     uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY );
     bool bChanged = false;
 
-    assert(xCurve.is());
+    OSL_ASSERT(xCurve.is());
     if(!xCurve.is())
         return false;
 
@@ -255,7 +255,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
 void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const
 {
     uno::Reference<chart2::XRegressionCurve> xCurve(GetPropertySet(), uno::UNO_QUERY);
-    assert(xCurve.is());
+    OSL_ASSERT(xCurve.is());
     if(!xCurve.is())
         return;
 
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 6defac735041..dc48db2d0fa9 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -174,7 +174,7 @@ uno::Reference< beans::XPropertySet > lcl_getCurveProperties(
 template <class T, class D>
 bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue());
@@ -192,7 +192,7 @@ bool lclConvertToPropertySet(const SfxItemSet& rItemSet, sal_uInt16 nWhichId, co
 template <class T, class D>
 void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         T aValue = static_cast<T>(static_cast<const D&>(rItemSet.Get( nWhichId )).GetValue());
@@ -205,7 +205,7 @@ void lclConvertToItemSet(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::R
 
 void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const uno::Reference<beans::XPropertySet>& xProperties, const OUString& aPropertyID)
 {
-    assert(xProperties.is());
+    OSL_ASSERT(xProperties.is());
     if( xProperties.is() )
     {
         double aValue = static_cast<const SvxDoubleItem&>(rItemSet.Get( nWhichId )).GetValue();
@@ -582,7 +582,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
                         {
                             // no data range for error bars yet => create
                             uno::Reference< chart2::XInternalDataProvider > xIntDataProvider( xDataProvider, uno::UNO_QUERY );
-                            assert(xIntDataProvider.is());
+                            OSL_ASSERT( xIntDataProvider.is());
                             if( xIntDataProvider.is())
                             {
                                 xIntDataProvider->appendSequence();