summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-07-01 09:59:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-01 10:56:14 +0100
commit5ace3f3b4f2f916d8b2acab1b5cc0fe2a5a19dee (patch)
tree00cdcfc6ef33bc558bda62935d46377f033975d6 /svtools
parent62cb50fd9b97358114dcc4d0c1afdcdd04341b0c (diff)
clang scan-build: various warnings
Change-Id: I4bdfb074b3cf6fcb49765322308dfa4b9ed67713
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/svlbitm.cxx2
-rw-r--r--svtools/source/contnr/treelist.cxx2
-rw-r--r--svtools/source/svrtf/svparser.cxx3
3 files changed, 3 insertions, 4 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 62a34a90328d..b11ec76af6f3 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -137,7 +137,7 @@ SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) co
SvTreeListEntry* SvLBoxButtonData::GetActEntry() const
{
- DBG_ASSERT( pImpl, "-SvLBoxButtonData::GetActEntry(): don't use me that way!" );
+ assert(pImpl && "-SvLBoxButtonData::GetActEntry(): don't use me that way!");
return pImpl->pEntry;
}
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index f60b1c9247e2..362f93b4f42a 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1051,7 +1051,7 @@ bool SvTreeList::Remove( const SvTreeListEntry* pEntry )
void SvTreeList::SelectAll( SvListView* pView, bool bSelect )
{
- DBG_ASSERT(pView,"SelectAll:NoView");
+ assert(pView && "SelectAll:NoView");
SvTreeListEntry* pEntry = First();
while ( pEntry )
{
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 114e37772a72..51783a654f26 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -241,8 +241,7 @@ sal_Unicode SvParser::GetNextChar()
}
else
{
- DBG_ASSERT( pImplData && pImplData->hConv,
- "no text converter!" );
+ assert(pImplData && pImplData->hConv && "no text converter!");
sal_Unicode cUC;
sal_uInt32 nInfo = 0;