diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-16 15:38:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-17 08:19:15 +0200 |
| commit | 13b6e5d50affa56cb9c449252227933ab0fa1268 (patch) | |
| tree | 474b266e01073532a63e58f0f8f93df515cb017b /sot | |
| parent | 5aa942f3a5bf83e0426438913acc040abb6a329f (diff) | |
loplugin:logexceptionnicely in shell..sot
Change-Id: I2ae0c0ac06f32ef91951aa4f7c98b5706178f841
Reviewed-on: https://gerrit.libreoffice.org/74115
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/storage.cxx | 5 | ||||
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 62fed8cfa692..423482349ecf 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -31,6 +31,7 @@ #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <tools/diagnose_ex.h> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbhelper.hxx> @@ -760,9 +761,9 @@ SotClipboardFormatId SotStorage::GetFormatID( const css::uno::Reference < css::e { xProps->getPropertyValue("MediaType") >>= aMediaType; } - catch (uno::Exception const& e) + catch (uno::Exception const&) { - SAL_INFO("sot", "SotStorage::GetFormatID: exception: " << e); + TOOLS_INFO_EXCEPTION("sot", "SotStorage::GetFormatID"); } if ( !aMediaType.isEmpty() ) diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index f5dea724f153..c746fd25f5e9 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -45,6 +45,7 @@ #include <osl/diagnose.h> #include <osl/file.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <tools/ref.hxx> #include <tools/debug.hxx> #include <unotools/streamwrap.hxx> @@ -756,9 +757,9 @@ void UCBStorageStream_Impl::ReadSourceWriteTemporary() m_pStream->WriteBytes(aData.getArray(), aReaded); } while( aReaded == 32000 ); } - catch (const Exception &e) + catch (const Exception &) { - SAL_WARN( "sot", e ); + TOOLS_WARN_EXCEPTION("sot", ""); } } @@ -791,9 +792,9 @@ sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength) if( aResult < aLength ) m_bSourceRead = false; } - catch( const Exception & e ) + catch( const Exception & ) { - SAL_WARN( "sot", e ); + TOOLS_WARN_EXCEPTION("sot", ""); } } @@ -839,9 +840,9 @@ std::size_t UCBStorageStream_Impl::GetData(void* pData, std::size_t const nSize) aResult += m_pStream->WriteBytes(static_cast<void*>(aData.getArray()), aReaded); memcpy( pData, aData.getArray(), aReaded ); } - catch (const Exception &e) + catch (const Exception &) { - SAL_WARN( "sot", e ); + TOOLS_WARN_EXCEPTION("sot", ""); } if( aResult < nSize ) |