diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 10:15:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 10:48:25 +0100 |
| commit | 0d78ad871e85a74a2a7eac2f2a2ff94776f35e77 (patch) | |
| tree | a29ea7098cc49b1116db16f219bdc662e04ac874 /svtools | |
| parent | 807b696c5c15dc2d8255116305fd28ba60f201c0 (diff) | |
DBG_ASSERT->assert when followed by dereference
Change-Id: Ic1c999ffdc391ea01be5711721e7c9e63179473e
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelist.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 9 | ||||
| -rw-r--r-- | svtools/source/uno/unoevent.cxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 362f93b4f42a..a8830a6587c3 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -596,7 +596,7 @@ sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* p sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const { - DBG_ASSERT(pView,"GetVisCount:No View"); + assert(pView && "GetVisCount:No View"); if( !pView->HasViewData() ) return 0; if ( pView->nVisibleCount ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 5d0eadfe7627..2f6bc55d6b95 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3813,22 +3813,19 @@ void SvTreeListBox::ExcecuteContextMenuAction( sal_uInt16 ) void SvTreeListBox::EnableContextMenuHandling( void ) { - DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" ); - + assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!"); pImp->bContextMenuHandling = true; } void SvTreeListBox::EnableContextMenuHandling( bool b ) { - DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" ); - + assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!"); pImp->bContextMenuHandling = b; } bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const { - DBG_ASSERT( pImp, "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!" ); - + assert(pImp && "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!"); return pImp->bContextMenuHandling; } diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 627ea8f87f6d..a448ff70a52a 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -53,7 +53,7 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupport mpSupportedMacroItems(pSupportedMacroItems), mnMacroItems(0) { - DBG_ASSERT(pSupportedMacroItems != NULL, "Need a list of supported events!"); + assert(pSupportedMacroItems != NULL && "Need a list of supported events!"); for( ; mpSupportedMacroItems[mnMacroItems].mnEvent != 0; mnMacroItems++) ; } |