diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-11 16:00:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-11 16:00:46 +0200 |
commit | d9baa2b06e7349fce55cb706563c3017f33c01e0 (patch) | |
tree | bd16d00668b6b5e2a5d3b7dec4f6eadb9a469a68 /basic/source | |
parent | fffc2b704f2a03ad57c8521f4d00785aead91678 (diff) |
-Werror,-Wundefined-bool-conversion
Change-Id: I81edff750eab6bbeef75fbd1a5fcca0f01379daa
Diffstat (limited to 'basic/source')
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxobj.cxx | 8 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 6 | ||||
-rw-r--r-- | basic/source/sbx/sbxvar.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index b9fbecb75fc2..3cbfb1c8d7bb 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -857,7 +857,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase // Plausibility! if( nLibs & 0xF000 ) { - DBG_ASSERT( !this, "BasicManager-Stream defect!" ); + DBG_ASSERT( false, "BasicManager-Stream defect!" ); return; } for ( sal_uInt16 nL = 0; nL < nLibs; nL++ ) diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 97dd202d67a2..a9b69ec59718 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -254,7 +254,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) case SbxCLASS_PROPERTY: pArray = pProps; break; case SbxCLASS_METHOD: pArray = pMethods; break; case SbxCLASS_OBJECT: pArray = pObjs; break; - default: DBG_ASSERT( !this, "Invalid SBX-Class" ); break; + default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; } if( pArray ) { @@ -350,7 +350,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx ) case SbxCLASS_PROPERTY: pArray = pProps; break; case SbxCLASS_METHOD: pArray = pMethods; break; case SbxCLASS_OBJECT: pArray = pObjs; break; - default: DBG_ASSERT( !this, "Invalid SBX-Class" ); break; + default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; } if( pArray ) { @@ -386,7 +386,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp case SbxCLASS_PROPERTY: pArray = pProps; break; case SbxCLASS_METHOD: pArray = pMethods; break; case SbxCLASS_OBJECT: pArray = pObjs; break; - default: DBG_ASSERT( !this, "Invalid SBX-Class" ); break; + default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; } if( !pArray ) { @@ -524,7 +524,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar ) case SbxCLASS_PROPERTY: pArray = pProps; break; case SbxCLASS_METHOD: pArray = pMethods; break; case SbxCLASS_OBJECT: pArray = pObjs; break; - default: DBG_ASSERT( !this, "Invalid SBX-Class" ); break; + default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; } } if( pArray ) diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index af454c71efd4..f1efde2295d6 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -75,7 +75,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase() aData.pDecimal->addRef(); break; default: - DBG_ASSERT( !this, "Improper pointer argument" ); + DBG_ASSERT( false, "Improper pointer argument" ); n = SbxNULL; } } @@ -1546,7 +1546,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) memset (&aData,0,sizeof(aData)); ResetFlag(SBX_FIXED); aData.eType = SbxNULL; - DBG_ASSERT( !this, "Loaded a non-supported data type" ); + DBG_ASSERT( false, "Loaded a non-supported data type" ); return false; } @@ -1648,7 +1648,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxWCHAR: break; default: - DBG_ASSERT( !this, "Saving a non-supported data type" ); + DBG_ASSERT( false, "Saving a non-supported data type" ); return false; } return true; diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 7d1477b2f650..66c3b5e8180b 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -546,7 +546,7 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; default: aData.eType = SbxNULL; - DBG_ASSERT( !this, "Loaded a non-supported data type" ); + DBG_ASSERT( false, "Loaded a non-supported data type" ); return false; } // putt value |