revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

4 files changed, 6 insertions, 6 deletions

diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index d1d094d0b3b1..62ba06b9fe14 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -170,7 +170,7 @@ void lcl_throwCorruptedUIConfigurationException(
 {
     css::uno::Exception e;
     bool ok = (exception >>= e);
-    assert(ok); (void) ok; // avoid warnings
+    OSL_ASSERT(ok); (void) ok; // avoid warnings
     throw css::configuration::CorruptedUIConfigurationException(
         lcl_getLocalizedMessage(id),
         css::uno::Reference< css::uno::XInterface >(),
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 6d69d002541a..b8b9c3f47bd7 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -78,7 +78,7 @@ Sequence< Any > make_seq_out_of_struct(
     }
     typelib_TypeDescription * pTD = nullptr;
     TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() );
-    assert( pTD );
+    OSL_ASSERT( pTD );
     if (! pTD)
     {
         throw RuntimeException(
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 0c9f372e039c..1171aebc87d7 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -317,7 +317,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventO
 
     if (iDescriptor == maListeners.end())
     {
-        assert(iDescriptor != maListeners.end());
+        OSL_ASSERT(iDescriptor != maListeners.end());
         return;
     }
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 3b936d92ff8f..2ab500e34b04 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -148,7 +148,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_xContext( rxContext ),
     m_sIconTheme( SvtMiscOptions().GetIconTheme() )
 {
-    assert( m_xContext.is() );
+    OSL_ASSERT( m_xContext.is() );
 
     vcl::Window* pWindow = m_pToolBar;
     while ( pWindow && !pWindow->IsSystemWindow() )
@@ -204,12 +204,12 @@ ToolBarManager::~ToolBarManager()
 {
     assert(!m_aAsyncUpdateControllersTimer.IsActive());
     assert(!m_pToolBar); // must be disposed by ToolbarLayoutManager
-    assert( !m_bAddedToTaskPaneList );
+    OSL_ASSERT( !m_bAddedToTaskPaneList );
 }
 
 void ToolBarManager::Destroy()
 {
-    assert( m_pToolBar != nullptr );
+    OSL_ASSERT( m_pToolBar != nullptr );
     SolarMutexGuard g;
     if ( m_bAddedToTaskPaneList )
     {