diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 09:25:45 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 09:26:20 +1000 |
| commit | 19ad058856ad2e2994409cf3b0b142a8a72e4c6b (patch) | |
| tree | 69a7e8f89d39c392a91129c26d180d7fd8b27247 /svtools | |
| parent | 6fa4b7e0cc96cb621ac034fb1d2bc1ea649ff8f2 (diff) | |
tdf#43157: convert svtools codebase away from OSL_ASSERT to assert
Change-Id: Ib22caa642b6d7afd0b54e8a6d6e4961d416df3ee
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/itemholder2.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/dialogs/colrdlg.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 638120cf1515..bf55780dde80 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -162,7 +162,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) break; default: - OSL_ASSERT(false); + assert(false); break; } } diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 92d23b77f701..69b02388ff98 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -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; } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index fb315dc7ea18..066d508c4b4b 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -101,7 +101,7 @@ short SvColorDialog::Execute() } catch(Exception&) { - OSL_ASSERT(false); + assert(false); } return ret; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 4d802f1d7763..5376dcf3aea0 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -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, diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index a0e0853a79fe..36b33ff23824 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -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 ) ); } |