diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 14:42:51 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 18:10:44 +0000 |
commit | 272a8afa60fe9a6b497c69a58b0054ad5b880690 (patch) | |
tree | 7ab255dd96cad6ab57b1271559b1d45a1c40baa1 /basic | |
parent | 29eac0e49e372092cb119898e9f1116ab4e00532 (diff) |
convert more DBG_ASSERT(false to SAL_WARN
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55
Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basic')
-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 3443016ee3fc..9b8cf68a27a6 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -749,7 +749,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase // Plausibility! if( nLibs & 0xF000 ) { - DBG_ASSERT( false, "BasicManager-Stream defect!" ); + SAL_WARN( "basic", "BasicManager-Stream defect!" ); return; } const size_t nMinBasicLibSize(8); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 12b09277dec6..9cdd7777aa0f 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -242,7 +242,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) case SbxClassType::Property: pArray = pProps; break; case SbxClassType::Method: pArray = pMethods; break; case SbxClassType::Object: pArray = pObjs; break; - default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; + default: SAL_WARN( "basic", "Invalid SBX-Class" ); break; } if( pArray ) { @@ -338,7 +338,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx ) case SbxClassType::Property: pArray = pProps; break; case SbxClassType::Method: pArray = pMethods; break; case SbxClassType::Object: pArray = pObjs; break; - default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; + default: SAL_WARN( "basic", "Invalid SBX-Class" ); break; } if( pArray ) { @@ -374,7 +374,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp case SbxClassType::Property: pArray = pProps; break; case SbxClassType::Method: pArray = pMethods; break; case SbxClassType::Object: pArray = pObjs; break; - default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; + default: SAL_WARN( "basic", "Invalid SBX-Class" ); break; } if( !pArray ) { @@ -487,7 +487,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar ) case SbxClassType::Property: pArray = pProps; break; case SbxClassType::Method: pArray = pMethods; break; case SbxClassType::Object: pArray = pObjs; break; - default: DBG_ASSERT( false, "Invalid SBX-Class" ); break; + default: SAL_WARN( "basic", "Invalid SBX-Class" ); break; } } if( pArray ) diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 7bf87723a353..5e6195ddc420 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -76,7 +76,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase() aData.pDecimal->addRef(); break; default: - DBG_ASSERT( false, "Improper pointer argument" ); + SAL_WARN( "basic", "Improper pointer argument" ); n = SbxNULL; } } @@ -1551,7 +1551,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) memset (&aData,0,sizeof(aData)); ResetFlag(SbxFlagBits::Fixed); aData.eType = SbxNULL; - DBG_ASSERT( false, "Loaded a non-supported data type" ); + SAL_WARN( "basic", "Loaded a non-supported data type" ); return false; } @@ -1653,7 +1653,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxWCHAR: break; default: - DBG_ASSERT( false, "Saving a non-supported data type" ); + SAL_WARN( "basic", "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 1b52c46386d0..23d7bfe29ed3 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -544,7 +544,7 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; default: aData.eType = SbxNULL; - DBG_ASSERT( false, "Loaded a non-supported data type" ); + SAL_WARN( "basic", "Loaded a non-supported data type" ); return false; } // putt value |