revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

58 files changed, 138 insertions, 138 deletions

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index fdfbc5b19ad7..832f48bac59d 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -87,7 +87,7 @@ AccessibleBase::AccessibleBase(
         m_bStateSetInitialized( false )
 {
     // initialize some states
-    assert(m_xStateSetHelper.is());
+    OSL_ASSERT( m_xStateSetHelper.is() );
     m_xStateSetHelper->AddState( AccessibleStateType::ENABLED );
     m_xStateSetHelper->AddState( AccessibleStateType::SHOWING );
     m_xStateSetHelper->AddState( AccessibleStateType::VISIBLE );
@@ -97,7 +97,7 @@ AccessibleBase::AccessibleBase(
 
 AccessibleBase::~AccessibleBase()
 {
-    assert(m_bIsDisposed);
+    OSL_ASSERT( m_bIsDisposed );
 }
 
 bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const
@@ -177,14 +177,14 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId
 void AccessibleBase::AddState( sal_Int16 aState )
 {
     CheckDisposeState();
-    assert(m_xStateSetHelper.is());
+    OSL_ASSERT( m_xStateSetHelper.is() );
     m_xStateSetHelper->AddState( aState );
 }
 
 void AccessibleBase::RemoveState( sal_Int16 aState )
 {
     CheckDisposeState();
-    assert(m_xStateSetHelper.is());
+    OSL_ASSERT( m_xStateSetHelper.is() );
     m_xStateSetHelper->RemoveState( aState );
 }
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 6f113bf7fec8..b231b030c56a 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -55,7 +55,7 @@ AccessibleChartElement::AccessibleChartElement(
 
 AccessibleChartElement::~AccessibleChartElement()
 {
-    assert(CheckDisposeState(false /* don't throw exceptions */));
+    OSL_ASSERT( CheckDisposeState( false /* don't throw exceptions */ ) );
 }
 
 // ________ protected ________
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index c12a8f59a974..2757cef19cb2 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -65,7 +65,7 @@ AccessibleChartShape::AccessibleChartShape(
 
 AccessibleChartShape::~AccessibleChartShape()
 {
-    assert(CheckDisposeState(false /* don't throw exceptions */));
+    OSL_ASSERT( CheckDisposeState( false /* don't throw exceptions */ ) );
 
     if ( m_pAccShape.is() )
     {
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 4d3b90e6c0a9..4493a48c647d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -582,7 +582,7 @@ void ChartDataWrapper::fireChartDataChangeEvent( css::chart::ChartDataChangeEven
         return;
 
     uno::Reference< uno::XInterface > xSrc( static_cast< cppu::OWeakObject* >( this ));
-    assert(xSrc.is());
+    OSL_ASSERT( xSrc.is());
     if( xSrc.is() )
         aEvent.Source = xSrc;
 
@@ -625,7 +625,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
     bool bPercent = false;
     bool bDeep = false;
     uno::Reference< css::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY );
-    assert(xOldDoc.is());
+    OSL_ASSERT( xOldDoc.is());
     uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY );
     if( xDiaProp.is())
     {
@@ -659,7 +659,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
     switchToInternalDataProvider();
     rDataOperator.apply(m_xDataAccess);
     uno::Reference< chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() );
-    assert(xDataProvider.is());
+    OSL_ASSERT( xDataProvider.is() );
     if( !xDataProvider.is() )
         return;
     uno::Reference< chart2::data::XDataSource > xSource( xDataProvider->createDataSource( aArguments ) );
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 8cc1550658b7..5c03301bb21c 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -273,8 +273,8 @@ Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet()
 
 void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue )
 {
-    assert( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
-            nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
+    OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
+                nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
 
     Reference< beans::XPropertySet > xProp( getFirstCharacterPropertySet(), uno::UNO_QUERY );
     Reference< beans::XFastPropertySet > xFastProp( xProp, uno::UNO_QUERY );
@@ -296,8 +296,8 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue
 void TitleWrapper::setFastCharacterPropertyValue(
     sal_Int32 nHandle, const Any& rValue )
 {
-    assert( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
-            nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
+    OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
+                nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
 
     Reference< chart2::XTitle > xTitle( this->getTitleObject() );
     if( xTitle.is())
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index b694d54d45be..4548d3b6f4df 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -636,7 +636,7 @@ void DataBrowser::RenewTable()
 
 OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
 {
-    assert(m_apDataBrowserModel.get());
+    OSL_ASSERT( m_apDataBrowserModel.get());
     if( nColumnId > 0 )
         return OUString( m_apDataBrowserModel->getRoleOfColumn( nColumnId - 1 ));
     return OUString();
@@ -694,7 +694,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
         }
         else
         {
-            assert(m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXT);
+            OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXT );
             aResult = m_apDataBrowserModel->getCellText( nColIndex, nRow );
         }
     }
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 50610be8ca39..875137f1f576 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -279,7 +279,7 @@ private:
 
 void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
 {
-    assert(m_apDialogModel.get());
+    OSL_ASSERT( m_apDialogModel.get());
     Reference< chart2::XInternalDataProvider > xDataProvider(
         m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
 
@@ -400,7 +400,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex )
 {
     //create a new text column for complex categories
 
-    assert(m_apDialogModel.get());
+    OSL_ASSERT( m_apDialogModel.get());
     Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
     if (!xDataProvider.is())
         return;
@@ -438,7 +438,7 @@ void DataBrowserModel::removeComplexCategoryLevel( sal_Int32 nAtColumnIndex )
 
 void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColumnIndex )
 {
-    assert(m_apDialogModel.get());
+    OSL_ASSERT( m_apDialogModel.get());
     if (nAtColumnIndex < 0 || static_cast<size_t>(nAtColumnIndex) >= m_aColumns.size())
         // Out of bound.
         return;
@@ -509,7 +509,7 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
 
 void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
 {
-    assert(m_apDialogModel.get());
+    OSL_ASSERT( m_apDialogModel.get());
     if( static_cast< tDataColumnVector::size_type >( nFirstColumnIndex ) < m_aColumns.size() - 1 )
     {
         Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries );
@@ -523,7 +523,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
 
 void DataBrowserModel::swapDataPointForAllSeries( sal_Int32 nFirstIndex )
 {
-    assert(m_apDialogModel.get());
+    OSL_ASSERT( m_apDialogModel.get());
     Reference< chart2::XInternalDataProvider > xDataProvider(
         m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
     // lockControllers
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 94d0e87bec69..e4e74416667a 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -829,7 +829,7 @@ void DialogModel::applyInterpretedData(
         std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
             ContainerHelper::SequenceToVector( rNewData.Series ));
 
-        assert(aSeriesCnt.size() == aNewSeries.size());
+        OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
 
         std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin());
         std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin());
@@ -838,7 +838,7 @@ void DialogModel::applyInterpretedData(
         {
             try
             {
-                assert((*aDestIt).is());
+                OSL_ASSERT( (*aDestIt).is());
                 (*aDestIt)->setDataSeries( *aSrcIt );
             }
             catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 524bf71dd99f..71867a64cbdc 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -189,7 +189,7 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
     if( ! (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid ))
     {
         m_pBtnOK->Enable( false );
-        assert(m_pTabControl);
+        OSL_ASSERT( m_pTabControl );
         // note: there seems to be no suitable mechanism to address pages by
         // identifier, at least it is unclear what the page identifiers are.
         // @todo: change the fixed numbers to identifiers
@@ -211,7 +211,7 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage )
     if( m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid )
     {
         m_pBtnOK->Enable();
-        assert(m_pTabControl);
+        OSL_ASSERT( m_pTabControl );
         m_pTabControl->EnableTabToggling();
     }
 }
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index edcc10b04ee4..6f8cc675d86f 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -598,7 +598,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
         case TP_XERRORBAR:
         {
             ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage );
-            assert(pTabPage);
+            OSL_ASSERT( pTabPage );
             if( pTabPage )
             {
                 pTabPage->SetAxisMinorStepWidthForErrorBarDecimals( m_fAxisMinorStepWidthForErrorBarDecimals );
@@ -610,7 +610,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
         case TP_YERRORBAR:
         {
             ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage );
-            assert(pTabPage);
+            OSL_ASSERT( pTabPage );
             if( pTabPage )
             {
                 pTabPage->SetAxisMinorStepWidthForErrorBarDecimals( m_fAxisMinorStepWidthForErrorBarDecimals );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 13d2e143c87b..97b5d31a4fe5 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -193,7 +193,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
     m_apRangeSelectionHelper.reset( new RangeSelectionHelper( xChartDocument ));
 
     // has internal data provider => rename "cell range" to "from data"
-    assert(m_apRangeSelectionHelper.get());
+    OSL_ASSERT( m_apRangeSelectionHelper.get());
     if( m_bHasInternalDataProvider )
     {
         m_pRbRange->SetText(m_pUIStringRbRange->GetText());
@@ -440,10 +440,10 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, Button*, void)
 
 IMPL_LINK( ErrorBarResources, ChooseRange, Button*, pButton, void )
 {
-    assert(m_apRangeSelectionHelper.get());
+    OSL_ASSERT( m_apRangeSelectionHelper.get());
     if( ! m_apRangeSelectionHelper.get())
         return;
-    assert(m_pCurrentRangeChoosingField == nullptr );
+    OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
 
     OUString aUIString;
 
@@ -680,7 +680,7 @@ void ErrorBarResources::FillValueSets()
 void ErrorBarResources::listeningFinished(
     const OUString & rNewRange )
 {
-    assert(m_apRangeSelectionHelper.get());
+    OSL_ASSERT( m_apRangeSelectionHelper.get());
     if( ! m_apRangeSelectionHelper.get())
         return;
 
@@ -707,14 +707,14 @@ void ErrorBarResources::listeningFinished(
     m_pCurrentRangeChoosingField = nullptr;
 
     UpdateControlStates();
-    assert(m_pParentDialog);
+    OSL_ASSERT( m_pParentDialog );
     if( m_pParentDialog )
         lcl_enableRangeChoosing( false, m_pParentDialog );
 }
 
 void ErrorBarResources::disposingRangeSelection()
 {
-    assert(m_apRangeSelectionHelper.get());
+    OSL_ASSERT( m_apRangeSelectionHelper.get());
     if( m_apRangeSelectionHelper.get())
         m_apRangeSelectionHelper->stopRangeListening( false );
 }
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 93820fd687ea..65a97b3d554f 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -566,7 +566,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void
 
 IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
 {
-    assert(m_pCurrentRangeChoosingField == nullptr);
+    OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
     m_pCurrentRangeChoosingField = m_pEDT_RANGE;
     if( !m_pEDT_RANGE->GetText().isEmpty() &&
         ! updateModelFromControl( m_pCurrentRangeChoosingField ))
@@ -607,7 +607,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
 
 IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void)
 {
-    assert(m_pCurrentRangeChoosingField == nullptr);
+    OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
     m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES;
     if( !m_pEDT_CATEGORIES->GetText().isEmpty() &&
         ! updateModelFromControl( m_pCurrentRangeChoosingField ))
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 432d599cd002..c1005f5e0ef3 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -342,7 +342,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
         if( eKind == SdrHintKind::BeginEdit )
         {
             // #i79965# remember map mode
-            assert(!m_bRestoreMapMode);
+            OSL_ASSERT( ! m_bRestoreMapMode );
             OutputDevice* pOutDev = this->GetFirstOutputDevice();
             if( pOutDev )
             {
@@ -353,7 +353,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
         else if( eKind == SdrHintKind::EndEdit )
         {
             // #i79965# scroll back view when ending text edit
-            assert(m_bRestoreMapMode);
+            OSL_ASSERT( m_bRestoreMapMode );
             if( m_bRestoreMapMode )
             {
                 OutputDevice* pOutDev = this->GetFirstOutputDevice();
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();
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 99b3e95f07d4..b5577ff40f57 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -231,7 +231,7 @@ wrapper::ItemConverter* createItemConverter(
                         if( !ColorPerPointHelper::hasPointOwnColor( xSeriesProp, nPointIndex, xObjectProperties ) )
                         {
                             bUseSpecialFillColor = true;
-                            assert(xDiagram.is());
+                            OSL_ASSERT( xDiagram.is());
                             uno::Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme() );
                             if( xColorScheme.is())
                                 nSpecialFillColor = xColorScheme->getColorByIndex( nPointIndex );
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index c32dc95c4b3d..53b7594e412a 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -239,7 +239,7 @@ void ChartController::executeDispatch_ScaleText()
     ControllerLockGuardUNO aCtlLockGuard( getModel() );
 
     std::unique_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
-    assert(pRefSizeProv.get());
+    OSL_ASSERT( pRefSizeProv.get());
     if (pRefSizeProv)
         pRefSizeProv->toggleAutoResizeState();
 
@@ -438,7 +438,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
     {
         const Reference< lang::XMultiServiceFactory >& xShapeFactory( pDrawModelWrapper->getShapeFactory() );
         const Reference< drawing::XDrawPage >& xDrawPage( pDrawModelWrapper->getMainDrawPage() );
-        assert(xShapeFactory.is() && xDrawPage.is());
+        OSL_ASSERT( xShapeFactory.is() && xDrawPage.is() );
 
         if ( xShapeFactory.is() && xDrawPage.is() )
         {
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index eb60b009a279..2ad50b7cc088 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1279,7 +1279,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
     if( ! m_apAccelExecute.get() && m_xFrame.is() && m_xCC.is() )
     {
         m_apAccelExecute = ::svt::AcceleratorExecute::createAcceleratorHelper();
-        assert( m_apAccelExecute.get());
+        OSL_ASSERT( m_apAccelExecute.get());
         if( m_apAccelExecute.get() )
             m_apAccelExecute->init( m_xCC, m_xFrame );
     }
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index 193ed01cce71..937a11f168b1 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -160,7 +160,7 @@ namespace chart
         void ImplApplyDataToModel( const Reference< XModel >& i_model, const Reference< XInternalDataProvider > & i_data )
         {
             Reference< XChartDocument > xDoc( i_model, UNO_QUERY );
-            assert(xDoc.is() && xDoc->hasInternalDataProvider());
+            OSL_ASSERT( xDoc.is() && xDoc->hasInternalDataProvider() );
 
             // copy data from stored internal data provider
             if( xDoc.is() && xDoc->hasInternalDataProvider())
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 30c7e797418b..42beadb65f8d 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -86,7 +86,7 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu
             m_aListeners.begin(),
             tListenerMap::value_type( URL.Complete, new ::comphelper::OInterfaceContainerHelper2( m_aMutex )));
     }
-    assert(aIt != m_aListeners.end());
+    OSL_ASSERT( aIt != m_aListeners.end());
 
     aIt->second->addInterface( Control );
     fireStatusEvent( URL.Complete, Control );
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index fd24342f3637..16b1f5902f75 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -488,7 +488,7 @@ void ControllerCommandDispatch::initialize()
     {
         Reference< frame::XModel > xModel( m_xChartController->getModel());
         Reference< util::XModifyBroadcaster > xModifyBroadcaster( xModel, uno::UNO_QUERY );
-        assert(xModifyBroadcaster.is());
+        OSL_ASSERT( xModifyBroadcaster.is());
         if( xModifyBroadcaster.is())
             xModifyBroadcaster->addModifyListener( this );
 
@@ -522,8 +522,8 @@ void ControllerCommandDispatch::updateCommandAvailability()
     bool bModelStateIsValid = ( m_apModelState.get() != nullptr );
     bool bControllerStateIsValid = ( m_apControllerState.get() != nullptr );
     // Model and controller states exist.
-    assert(bModelStateIsValid);
-    assert(bControllerStateIsValid);
+    OSL_ASSERT( bModelStateIsValid );
+    OSL_ASSERT( bControllerStateIsValid );
 
     // read-only
     bool bIsWritable = bModelStateIsValid && (! m_apModelState->bIsReadOnly);
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 78bddb175ff8..3e9fd051127e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -778,7 +778,7 @@ bool ObjectKeyNavigation::next()
     {
         ObjectHierarchy::tChildContainer::const_iterator aIt(
             std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
-        assert(aIt != aSiblings.end());
+        OSL_ASSERT( aIt != aSiblings.end());
         if( ++aIt == aSiblings.end())
             aIt = aSiblings.begin();
         setCurrentSelection( *aIt );
@@ -798,7 +798,7 @@ bool ObjectKeyNavigation::previous()
     {
         ObjectHierarchy::tChildContainer::const_iterator aIt(
             std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
-        assert(aIt != aSiblings.end());
+        OSL_ASSERT( aIt != aSiblings.end());
         if( aIt == aSiblings.begin())
             aIt = aSiblings.end();
         --aIt;
@@ -825,7 +825,7 @@ bool ObjectKeyNavigation::down()
     if( bResult )
     {
         ObjectHierarchy::tChildContainer aChildren = aHierarchy.getChildren( getCurrentSelection());
-        assert(!aChildren.empty());
+        OSL_ASSERT( !aChildren.empty());
         setCurrentSelection( aChildren.front());
     }
     return bResult;
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 8c921eaeb88e..7b04bb4e4af4 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -50,7 +50,7 @@ void StatusBarCommandDispatch::initialize()
     if( m_xModifiable.is())
     {
         Reference< util::XModifyBroadcaster > xModifyBroadcaster( m_xModifiable, uno::UNO_QUERY );
-        assert(xModifyBroadcaster.is());
+        OSL_ASSERT( xModifyBroadcaster.is());
         if( xModifyBroadcaster.is())
             xModifyBroadcaster->addModifyListener( this );
     }
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 );
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index d7921c9fb8b1..473d1eed8015 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -351,7 +351,7 @@ Reference< XAxis > AxisHelper::createAxis(
     Reference< XAxis > xAxis( xContext->getServiceManager()->createInstanceWithContext(
                     "com.sun.star.chart2.Axis", xContext ), uno::UNO_QUERY );
 
-    assert( xAxis.is());
+    OSL_ASSERT( xAxis.is());
     if( xAxis.is())
     {
         xCooSys->setAxisByDimension( nDimensionIndex, xAxis, nAxisIndex );
@@ -439,7 +439,7 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
         xAxis.set( AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, xContext, pRefSizeProvider ) );
     }
 
-    assert( xAxis.is());
+    OSL_ASSERT( xAxis.is());
     if( !bNewAxisCreated ) //default is true already if created
         AxisHelper::makeAxisVisible( xAxis );
 }
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index f1ad78f7fbfc..53c5705d6d44 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -150,7 +150,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const
     }
     else
     {
-        assert( m_eCurrentDataType == MIXED );
+        OSL_ASSERT( m_eCurrentDataType == MIXED );
         const Any * pMixedArray = m_aMixedSequence.getConstArray();
         std::transform( pMixedArray, pMixedArray + nSize,
                           pResultArray,
@@ -180,7 +180,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const
     }
     else
     {
-        assert( m_eCurrentDataType == MIXED );
+        OSL_ASSERT( m_eCurrentDataType == MIXED );
         const Any * pMixedArray = m_aMixedSequence.getConstArray();
         std::transform( pMixedArray, pMixedArray + nSize,
                           pResultArray,
@@ -211,7 +211,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
     }
     else
     {
-        assert( m_eCurrentDataType == TEXTUAL );
+        OSL_ASSERT( m_eCurrentDataType == TEXTUAL );
         const OUString * pMixedArray = m_aTextualSequence.getConstArray();
         std::transform( pMixedArray, pMixedArray + nSize,
                           pResultArray,
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 223ef040dc4f..663f3b9c96a2 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -501,7 +501,7 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
     aValues[ i++ ]  >>= aResult.Underline;
     aValues[ i++ ]  >>= aResult.Weight;
     aValues[ i++ ]  >>= aResult.WordLineMode;
-    assert( i == aValues.getLength());
+    OSL_ASSERT( i == aValues.getLength());
 
     return aResult;
 }
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 3c749d5d57f8..436c1050ac6c 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -421,7 +421,7 @@ uno::Sequence< double > DataSequenceToDoubleSequence(
     const uno::Reference< data::XDataSequence >& xDataSequence )
 {
     uno::Sequence< double > aResult;
-    assert( xDataSequence.is());
+    OSL_ASSERT( xDataSequence.is());
     if(!xDataSequence.is())
         return aResult;
 
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index b61b84d29f45..e4792d415ecf 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -125,7 +125,7 @@ void ConfigColorScheme::retrieveConfigColors()
             new impl::ChartConfigItem( *this ));
         m_apChartConfigItem->addPropertyNotification( aSeriesPropName );
     }
-    assert( m_apChartConfigItem.get());
+    OSL_ASSERT( m_apChartConfigItem.get());
     if( ! m_apChartConfigItem.get())
         return;
 
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index a5958fa8ddee..3bc8e462a839 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -291,7 +291,7 @@ void DiagramHelper::setStackMode(
 
                 //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;
 
@@ -380,7 +380,7 @@ StackMode DiagramHelper::getStackModeFromChartType(
             chart2::StackingDirection eCurrentDirection = eCommonDirection;
             // property is not MAYBEVOID
             bool bSuccess = ( xProp->getPropertyValue( "StackingDirection" ) >>= eCurrentDirection );
-            assert( bSuccess );
+            OSL_ASSERT( bSuccess );
             (void)(bSuccess);  // avoid warning in non-debug builds
             if( ! bDirectionInitialized )
             {
@@ -532,7 +532,7 @@ void DiagramHelper::replaceCoordinateSystem(
     const Reference< XCoordinateSystem > & xCooSysToReplace,
     const Reference< XCoordinateSystem > & xReplacement )
 {
-    assert( xDiagram.is());
+    OSL_ASSERT( xDiagram.is());
     if( ! xDiagram.is())
         return;
 
@@ -645,7 +645,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
 
         //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() );
@@ -655,7 +655,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
 
             //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;
 
@@ -781,14 +781,14 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
         for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i )
         {
             Reference< XCoordinateSystem > xCooSys( aCooSysSeq[i] );
-            assert( xCooSys.is());
+            OSL_ASSERT( xCooSys.is());
             for( sal_Int32 nN = xCooSys->getDimension(); nN--; )
             {
                 const sal_Int32 nMaximumScaleIndex = xCooSys->getMaximumAxisIndexByDimension(nN);
                 for(sal_Int32 nI=0; nI<=nMaximumScaleIndex; ++nI)
                 {
                     Reference< XAxis > xAxis = xCooSys->getAxisByDimension( nN,nI );
-                    assert( xAxis.is());
+                    OSL_ASSERT( xAxis.is());
                     if( xAxis.is())
                     {
                         ScaleData aScaleData = xAxis->getScaleData();
@@ -828,14 +828,14 @@ bool DiagramHelper::isCategoryDiagram(
         for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i )
         {
             Reference< XCoordinateSystem > xCooSys( aCooSysSeq[i] );
-            assert( xCooSys.is());
+            OSL_ASSERT( xCooSys.is());
             for( sal_Int32 nN = xCooSys->getDimension(); nN--; )
             {
                 const sal_Int32 nMaximumScaleIndex = xCooSys->getMaximumAxisIndexByDimension(nN);
                 for(sal_Int32 nI=0; nI<=nMaximumScaleIndex; ++nI)
                 {
                     Reference< XAxis > xAxis = xCooSys->getAxisByDimension( nN,nI );
-                    assert( xAxis.is());
+                    OSL_ASSERT( xAxis.is());
                     if( xAxis.is())
                     {
                         ScaleData aScaleData = xAxis->getScaleData();
@@ -1314,7 +1314,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
 
                 //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() );
@@ -1326,7 +1326,7 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
 
                     //iterate through all series in this chart type
                     uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xCurrentChartType, uno::UNO_QUERY );
-                    assert( xDataSeriesContainer.is());
+                    OSL_ASSERT( xDataSeriesContainer.is());
                     if( !xDataSeriesContainer.is() )
                         continue;
 
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 2e6e0f8ec8bf..e24695621824 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -307,7 +307,7 @@ bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount )
 void InternalData::insertColumn( sal_Int32 nAfterIndex )
 {
     // note: -1 is allowed, as we insert after the given index
-    assert( nAfterIndex < m_nColumnCount && nAfterIndex >= -1 );
+    OSL_ASSERT( nAfterIndex < m_nColumnCount && nAfterIndex >= -1 );
     if( nAfterIndex >= m_nColumnCount || nAfterIndex < -1 )
         return;
     sal_Int32 nNewColumnCount = m_nColumnCount + 1;
@@ -364,7 +364,7 @@ sal_Int32 InternalData::getColumnCount() const
 void InternalData::insertRow( sal_Int32 nAfterIndex )
 {
     // note: -1 is allowed, as we insert after the given index
-    assert( nAfterIndex < m_nRowCount && nAfterIndex >= -1 );
+    OSL_ASSERT( nAfterIndex < m_nRowCount && nAfterIndex >= -1 );
     if( nAfterIndex >= m_nRowCount || nAfterIndex < -1 )
         return;
     sal_Int32 nNewRowCount = m_nRowCount + 1;
@@ -401,7 +401,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
 
 void InternalData::deleteColumn( sal_Int32 nAtIndex )
 {
-    assert( nAtIndex < m_nColumnCount && nAtIndex >= 0 );
+    OSL_ASSERT( nAtIndex < m_nColumnCount && nAtIndex >= 0 );
     if( nAtIndex >= m_nColumnCount || m_nColumnCount < 1 || nAtIndex < 0 )
         return;
     sal_Int32 nNewColumnCount = m_nColumnCount - 1;
@@ -435,7 +435,7 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex )
 
 void InternalData::deleteRow( sal_Int32 nAtIndex )
 {
-    assert( nAtIndex < m_nRowCount && nAtIndex >= 0 );
+    OSL_ASSERT( nAtIndex < m_nRowCount && nAtIndex >= 0 );
     if( nAtIndex >= m_nRowCount || m_nRowCount < 1 || nAtIndex < 0 )
         return;
     sal_Int32 nNewRowCount = m_nRowCount - 1;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index da95f3486543..fa77624adc44 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -712,7 +712,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
         return new DataSource( comphelper::containerToSequence(aComplexCategories) );
     }
 
-    assert( aRangeRepresentation == lcl_aCompleteRange );
+    OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange );
 
     std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec;
 
@@ -799,7 +799,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
 {
     if( aRangeRepresentation.match( lcl_aCategoriesRangeName ))
     {
-        assert( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
+        OSL_ASSERT( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
 
         // categories
         return createDataSequenceAndAddToMap( lcl_aCategoriesRangeName, lcl_aCategoriesRoleName );
@@ -846,7 +846,7 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt
 
     if( aRange.match( lcl_aCategoriesRangeName ))
     {
-        assert( aRange == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
+        OSL_ASSERT( aRange == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
         bResult = true;
     }
     else if( aRange.match( lcl_aLabelRangePrefix ))
@@ -1155,7 +1155,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
     // @todo: add this information in the range representation strings
     if( aRangeRepresentation.match( lcl_aCategoriesRangeName ))
     {
-        assert( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
+        OSL_ASSERT( aRangeRepresentation == lcl_aCategoriesRangeName );//it is not expected nor implemented that only parts of the categories are really requested
         aRange.aUpperLeft.bIsEmpty = false;
         if( m_bDataInColumns )
         {
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index dcd9851b7058..6d662c1d252d 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -80,7 +80,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
                     fErrorSum += (v*v);
                 }
             }
-            assert( fErrorSum >= 0.0 );
+            OSL_ASSERT( fErrorSum >= 0.0 );
             m_fCorrelationCoeffitient = sqrt( fErrorSum / (nMax - 1 ));
         }
     }
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 5b613629032b..8741037b6014 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -41,7 +41,7 @@ struct lcl_EqualsElement : public std::unary_function< OUString, bool >
     explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess )
             : m_aValue( rValue ), m_xAccess( xAccess )
     {
-        assert( m_xAccess.is());
+        OSL_ASSERT( m_xAccess.is());
     }
 
     bool operator() ( const OUString & rName )
@@ -155,7 +155,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
                 aUniqueName = rPrefix + OUString::number( nIndex );
             }
 
-            assert( !aUniqueName.isEmpty());
+            OSL_ASSERT( !aUniqueName.isEmpty());
             xNameContainer->insertByName( aUniqueName, rValue );
             return aUniqueName;
         }
diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx
index 0c7d6171bdf2..a205d75d6448 100644
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -304,7 +304,7 @@ bool RelativePositionHelper::centerGrow(
     }
 
     // anchor must not be changed
-    assert( rInOutPosition.Anchor == aPos.Anchor );
+    OSL_ASSERT( rInOutPosition.Anchor == aPos.Anchor );
 
     if( rInOutPosition.Primary == aPos.Primary &&
         rInOutPosition.Secondary == aPos.Secondary &&
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
index 07b27fc61a8c..3f3fb615697a 100644
--- a/chart2/source/tools/ResourceManager.cxx
+++ b/chart2/source/tools/ResourceManager.cxx
@@ -30,7 +30,7 @@ ResMgr & ResourceManager::getResourceManager()
     static ResMgr * pResourceManager = nullptr;
     if( ! pResourceManager )
         pResourceManager = ResMgr::CreateResMgr("chartcontroller");
-    assert( pResourceManager );
+    OSL_ASSERT( pResourceManager );
     return *pResourceManager;
 }
 
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 94aa4faedd0e..f7f1ff7ef1d8 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -313,7 +313,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
         xErrorBar.set( new ErrorBar );
     }
 
-    assert( xErrorBar.is());
+    OSL_ASSERT( xErrorBar.is());
     if( xErrorBar.is())
     {
         xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle ));
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 3d94de98e9eb..b3cd9a77c67f 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -668,8 +668,8 @@ void SplineCalculater::CalculateBSplines(
     // ODF1.2 spec variable k. Causion, k is used as index in the spec in addition.
     // nDegree is ODF1.2 file format attribute chart:spline-order and
     // ODF1.2 spec variable p
-    assert( nResolution > 1 );
-    assert( nDegree >= 1 );
+    OSL_ASSERT( nResolution > 1 );
+    OSL_ASSERT( nDegree >= 1 );
 
     // limit the b-spline degree at 15 to prevent insanely large sets of points
     sal_uInt32 p = std::min<sal_uInt32>(nDegree, 15);
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 3fee4195e507..38a6bb865730 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1218,7 +1218,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
     const uno::Reference< chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator,
     awt::Point aDefaultPos )
 {
-    assert(xEquationProperties.is());
+    OSL_ASSERT( xEquationProperties.is());
     if( !xEquationProperties.is())
         return;
 
@@ -1317,7 +1317,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
                     xEquationTarget, aFormula.makeStringAndClear(),
                     aNames, aValues, AbstractShapeFactory::makeTransformation( aScreenPosition2D ));
 
-                assert(xTextShape.is());
+                OSL_ASSERT( xTextShape.is());
                 if( xTextShape.is())
                 {
                     AbstractShapeFactory::setShapeName( xTextShape, rEquationCID );
@@ -2350,7 +2350,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
             if( xChild.is())
                 xChild->setParent( xSeriesProps );
 
-            assert(xPointSet.is());
+            OSL_ASSERT( xPointSet.is());
             xPointSet->setPropertyValue(
                 "Color", uno::Any( m_xColorScheme->getColorByIndex( nPointIndex )));
         }
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 4cd9c8362d88..ccaa3f868444 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -494,7 +494,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 
     //iterate through all coordinate systems
     uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
-    assert(xCooSysContainer.is());
+    OSL_ASSERT( xCooSysContainer.is());
     if( !xCooSysContainer.is())
         return;
     uno::Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
@@ -507,7 +507,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 
         //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() );
@@ -550,7 +550,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
                 pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
 
             uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
-            assert(xDataSeriesContainer.is());
+            OSL_ASSERT( xDataSeriesContainer.is());
             if( !xDataSeriesContainer.is() )
                 continue;
 
@@ -3414,7 +3414,7 @@ void ChartView::createShapes3D()
 
     //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() )
         return;
 
@@ -3437,7 +3437,7 @@ void ChartView::createShapes3D()
     }
 
     uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
-    assert(xDataSeriesContainer.is());
+    OSL_ASSERT( xDataSeriesContainer.is());
     if( !xDataSeriesContainer.is() )
         return;
 
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index effa91d53028..bf51d0bd64d8 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -297,7 +297,7 @@ awt::Size lcl_placeLegendEntries(
 
     std::vector< Reference< drawing::XShape > > aTextShapes;
     awt::Size aMaxEntryExtent = lcl_createTextShapes( rEntries, xShapeFactory, xTarget, aTextShapes, rTextProperties );
-    assert(aTextShapes.size() == rEntries.size());
+    OSL_ASSERT( aTextShapes.size() == rEntries.size());
 
     sal_Int32 nMaxEntryWidth = nXOffset + nSymbolPlusDistanceWidth + aMaxEntryExtent.Width;
     sal_Int32 nMaxEntryHeight = nYOffset + aMaxEntryExtent.Height;