diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-15 15:56:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-16 13:31:26 +0200 |
| commit | 889dc7bffa02236bf2ad56b382997771f0fcf3c6 (patch) | |
| tree | e7fc2c8748972bb1ed4acb98fd92ff08a8670f7b /basic | |
| parent | 9a97a26511584f41c3753fa9536e1c4a8dce637a (diff) | |
use more TOOLS_WARN_EXCEPTION
Change-Id: Ic21ea11ff106e0732bb8fa600ef39a549d7bda86
Reviewed-on: https://gerrit.libreoffice.org/77569
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 3 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 3 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 20 |
3 files changed, 8 insertions, 18 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 0ba3cb5d8b66..09eb6a57663a 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -146,8 +146,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ) } catch(const Exception& ) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN( "basic", "DocObjectWrapper::DocObjectWrapper: Caught exception! " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION( "basic", "DocObjectWrapper::DocObjectWrapper" ); } } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 74f849ad576f..70300cc6542e 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -344,8 +344,7 @@ SbiInstance::~SbiInstance() } catch( const Exception& ) { - css::uno::Any ex(DbgGetCaughtException()); - SAL_WARN("basic", "SbiInstance::~SbiInstance: caught an exception while disposing the components! " << exceptionToString(ex) ); + TOOLS_WARN_EXCEPTION("basic", "SbiInstance::~SbiInstance: caught an exception while disposing the components" ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 95a05bca652c..3f5840b51b06 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -908,12 +908,9 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, catch(const uno::Exception& ) { #if OSL_DEBUG_LEVEL > 0 - Any aError( ::cppu::getCaughtException() ); - SAL_WARN( + TOOLS_WARN_EXCEPTION( "basic", - "couldn't open sub storage for library \"" - << rLib.aName << "\". Exception: " - << exceptionToString(aError)); + "couldn't open sub storage for library \"" << rLib.aName << "\""); #endif } } @@ -1938,12 +1935,9 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto } catch(const uno::Exception& ) { - Any aError( ::cppu::getCaughtException() ); - SAL_WARN( + TOOLS_WARN_EXCEPTION( "basic", - "couldn't create sub storage for library \"" - << rLib.aName << "\". Exception: " - << exceptionToString(aError)); + "couldn't create sub storage for library \"" << rLib.aName << "\""); throw; } #endif @@ -2349,11 +2343,9 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) } catch(const uno::Exception& ) { - Any aError( ::cppu::getCaughtException() ); - SAL_WARN( + TOOLS_WARN_EXCEPTION( "basic", - "couldn't open sub storage for library \"" << Name - << "\". Exception: " << exceptionToString(aError)); + "couldn't open sub storage for library \"" << Name << "\""); throw; } #endif |