revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

8 files changed, 13 insertions, 13 deletions

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