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

tdf#43157: convert svtools codebase away from OSL_ASSERT to assert

Change-Id: Ib22caa642b6d7afd0b54e8a6d6e4961d416df3ee
üst 6fa4b7e0
......@@ -162,7 +162,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
break;
default:
OSL_ASSERT(false);
assert(false);
break;
}
}
......
......@@ -46,7 +46,7 @@ namespace svtools {
static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
{
OSL_ASSERT( pWindow );
assert( pWindow );
if ( pWindow )
{
// ->manually search topmost system window
......@@ -60,7 +60,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
pWindow = pWindow->GetParent();
}
pWindow = pTopMostSysWin;
OSL_ASSERT( pWindow );
assert( pWindow );
return pWindow;
}
......
......@@ -101,7 +101,7 @@ short SvColorDialog::Execute()
}
catch(Exception&)
{
OSL_ASSERT(false);
assert(false);
}
return ret;
......
......@@ -63,7 +63,7 @@ ToolboxController::ToolboxController(
, m_aCommandURL( aCommandURL )
, m_aListenerContainer( m_aMutex )
{
OSL_ASSERT( m_xContext.is() );
assert( m_xContext.is() );
registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE,
TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE,
css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY,
......
......@@ -517,7 +517,7 @@ Any SAL_CALL TreeControlPeer::getSelection()
--nSelectionCount;
}
OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
assert( (pEntry == nullptr) && (nSelectionCount == 0) );
aRet <<= aSelection;
}
......@@ -618,7 +618,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
--nSelectionCount;
}
OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
assert( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}
......@@ -641,7 +641,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
--nSelectionCount;
}
OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
assert( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}
......
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