diff options
| author | Radu Ioan <ioan.radu.g@gmail.com> | 2013-01-09 00:14:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-14 08:47:52 +0000 |
| commit | d4bca924dd7ebe1b57f15de3e741f0fffcb67225 (patch) | |
| tree | 0da7cdde17b8bbce4596d9d4a3d4e5069b78208d /basic/source/runtime/runtime.cxx | |
| parent | 56c4deae00e42719652b3f8cc3375180d7fd801e (diff) | |
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- Clean up OSL_
- Clean up DBG_
- Clean up OUString
Change-Id: I002d17ffbbd8371b0518ede34931b2eea30865a3
Reviewed-on: https://gerrit.libreoffice.org/1602
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'basic/source/runtime/runtime.cxx')
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index f8309a0bf1af..eba60649f255 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include "sbunoobj.hxx" #include "errobject.hxx" +#include "sal/log.hxx" #include "comenumwrapper.hxx" @@ -303,7 +304,7 @@ SbiInstance::~SbiInstance() } catch( const Exception& ) { - OSL_FAIL( "SbiInstance::~SbiInstance: caught an exception while disposing the components!" ); + SAL_WARN("basic", "SbiInstance::~SbiInstance: caught an exception while disposing the components!" ); } ComponentVector.clear(); @@ -916,7 +917,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, OUString& rMsg ) // TEST, has to be vb here always #ifdef DBG_UTIL SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError ); - DBG_ASSERT( nTmp, "No VB error!" ); + SAL_WARN_IF( nTmp == 0, "basic", "No VB error!" ); #endif StarBASIC::MakeErrorText( nError, rMsg ); @@ -964,7 +965,7 @@ SbxVariableRef SbiRuntime::PopVar() SbxVariableRef xVar = refExprStk->Get( --nExprLvl ); #ifdef DBG_UTIL if ( xVar->GetName().equalsAscii( "Cells" ) ) - OSL_TRACE( "" ); + SAL_INFO("basic", "" ); #endif // methods hold themselves in parameter 0 if( xVar->IsA( TYPE(SbxMethod) ) ) |