From 13b6e5d50affa56cb9c449252227933ab0fa1268 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 16 Jun 2019 15:38:36 +0200 Subject: loplugin:logexceptionnicely in shell..sot Change-Id: I2ae0c0ac06f32ef91951aa4f7c98b5706178f841 Reviewed-on: https://gerrit.libreoffice.org/74115 Tested-by: Jenkins Reviewed-by: Noel Grandin --- shell/Library_cmdmail.mk | 1 + shell/Library_desktopbe.mk | 1 + shell/source/backends/desktopbe/desktopbackend.cxx | 5 +++-- shell/source/cmdmail/cmdmailsuppl.cxx | 5 +++-- slideshow/source/engine/activitiesqueue.cxx | 4 ++-- slideshow/source/engine/eventqueue.cxx | 4 ++-- slideshow/source/engine/rehearsetimingsactivity.cxx | 5 +++-- slideshow/source/engine/shapes/viewappletshape.cxx | 4 ++-- slideshow/source/engine/shapes/viewmediashape.cxx | 4 ++-- slideshow/source/engine/shapesubset.cxx | 4 ++-- slideshow/source/engine/slide/userpaintoverlay.cxx | 5 +++-- .../source/engine/transitions/shapetransitionfactory.cxx | 4 ++-- slideshow/source/engine/usereventqueue.cxx | 4 ++-- sot/source/sdstor/storage.cxx | 5 +++-- sot/source/sdstor/ucbstorage.cxx | 13 +++++++------ 15 files changed, 38 insertions(+), 30 deletions(-) diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 49d76f72484b..4841fde2f1e8 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppu \ cppuhelper \ sal \ + tl \ )) $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index f782a0a146e3..e70f7c95c03e 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ cppuhelper \ sal \ + tl \ vcl \ )) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 14b22b033fb1..6b402a892427 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -284,9 +285,9 @@ css::uno::Reference< css::uno::XInterface > createBackend( } catch (css::uno::RuntimeException &) { // Assuming these exceptions are real errors: throw; - } catch (const css::uno::Exception & e) { + } catch (const css::uno::Exception &) { // Assuming these exceptions indicate that the service is not installed: - SAL_WARN("shell", "createInstance(" << name << ") failed with " << e); + TOOLS_WARN_EXCEPTION("shell", "createInstance(" << name << ") failed"); return css::uno::Reference< css::uno::XInterface >(); } } diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index eb931f23b683..efbefb21cab0 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -198,10 +199,10 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } - catch(const RuntimeException &e ) + catch(const RuntimeException & ) { + TOOLS_WARN_EXCEPTION("shell", "RuntimeException caught accessing configuration provider" ); m_xConfigurationProvider.clear(); - SAL_WARN("shell", "RuntimeException caught accessing configuration provider. " << e ); throw; } diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 3d1c076e2a02..191d2ef09981 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -55,9 +55,9 @@ namespace slideshow for( const auto& pActivity : maCurrentActivitiesReinsert ) pActivity->dispose(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 5740a935264b..a5609ae47a5c 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -72,9 +72,9 @@ namespace slideshow { maEvents.top().pEvent->dispose(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } maEvents.pop(); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 643d7c8eb2d9..573507cc0091 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -180,9 +181,9 @@ RehearseTimingsActivity::~RehearseTimingsActivity() { stop(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index dbe0c019bc9d..4f8c86bce467 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -103,9 +103,9 @@ namespace slideshow { endApplet(); } - catch (const uno::Exception &e) + catch (const uno::Exception &) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index bd50a71b70cb..e966709df748 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -102,9 +102,9 @@ namespace slideshow { endMedia(); } - catch (const uno::Exception &e) + catch (const uno::Exception &) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index cae844363cf5..188d30c95533 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -79,9 +79,9 @@ namespace slideshow // if not done yet: revoke subset from original disableSubsetShape(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index f0ef80dc32e9..1e167016dfb4 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -480,9 +481,9 @@ namespace slideshow mrMultiplexer.removeViewHandler( mpHandler ); mpHandler->dispose(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } } diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index c32ca07d0e25..d3054d4b9799 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -110,9 +110,9 @@ ClippingAnimation::~ClippingAnimation() { end_(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 9c976717b510..92d12bbb137a 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -551,9 +551,9 @@ UserEventQueue::~UserEventQueue() // unregister all handlers clear(); } - catch (const uno::Exception& e) + catch (const uno::Exception&) { - SAL_WARN("slideshow", e); + TOOLS_WARN_EXCEPTION("slideshow", ""); } } 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 #include #include +#include #include #include #include @@ -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 #include #include +#include #include #include #include @@ -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(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 ) -- cgit