revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

7 files changed, 21 insertions, 21 deletions

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 ))