Kaydet (Commit) ddce1e22 authored tarafından Chris Sherlock's avatar Chris Sherlock

tdf#43157: convert framework module away from OSL_ASSERT to assert

Change-Id: Iac0093a2a69d53c91c827ebba01fcdb5353e9b96
üst bbd2d2c1
......@@ -170,7 +170,7 @@ void lcl_throwCorruptedUIConfigurationException(
{
css::uno::Exception e;
bool ok = (exception >>= e);
OSL_ASSERT(ok); (void) ok; // avoid warnings
assert(ok); (void) ok; // avoid warnings
throw css::configuration::CorruptedUIConfigurationException(
lcl_getLocalizedMessage(id),
css::uno::Reference< css::uno::XInterface >(),
......
......@@ -78,7 +78,7 @@ Sequence< Any > make_seq_out_of_struct(
}
typelib_TypeDescription * pTD = nullptr;
TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() );
OSL_ASSERT( pTD );
assert( pTD );
if (! pTD)
{
throw RuntimeException(
......
......@@ -317,7 +317,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventO
if (iDescriptor == maListeners.end())
{
OSL_ASSERT(iDescriptor != maListeners.end());
assert(iDescriptor != maListeners.end());
return;
}
......
......@@ -148,7 +148,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_xContext( rxContext ),
m_sIconTheme( SvtMiscOptions().GetIconTheme() )
{
OSL_ASSERT( m_xContext.is() );
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
OSL_ASSERT( !m_bAddedToTaskPaneList );
assert( !m_bAddedToTaskPaneList );
}
void ToolBarManager::Destroy()
{
OSL_ASSERT( m_pToolBar != nullptr );
assert( m_pToolBar != nullptr );
SolarMutexGuard g;
if ( m_bAddedToTaskPaneList )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment