diff options
| -rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 5 | ||||
| -rw-r--r-- | extensions/Library_WinUserInfoBe.mk | 1 | ||||
| -rw-r--r-- | extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 879d0b0ce9ec..5a12ac3588ba 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -31,6 +31,7 @@ #include <comphelper/seqstream.hxx> #include <filter/msfilter/classids.hxx> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #if defined(_WIN32) #include "olecomponent.hxx" @@ -234,9 +235,9 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) { changeState(embed::EmbedStates::LOADED); } - catch( const uno::Exception& e ) + catch( const uno::Exception& ) { - SAL_WARN("embeddedobj.ole", "ignoring " << e); + TOOLS_WARN_EXCEPTION("embeddedobj.ole", "ignoring "); } } diff --git a/extensions/Library_WinUserInfoBe.mk b/extensions/Library_WinUserInfoBe.mk index 6fdad389a480..8d9835db5000 100644 --- a/extensions/Library_WinUserInfoBe.mk +++ b/extensions/Library_WinUserInfoBe.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_libraries,WinUserInfoBe,\ cppuhelper \ cppu \ sal \ + tl \ )) $(eval $(call gb_Library_use_system_win32_libs,WinUserInfoBe,\ diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx index d8959264af20..a7732fa196fd 100644 --- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx +++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx @@ -18,7 +18,7 @@ #include <cppuhelper/supportsservice.hxx> #include <map> #include <o3tl/char16_t2wchar_t.hxx> -#include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <Iads.h> #include <Adshlp.h> @@ -249,10 +249,10 @@ private: css::uno::UNO_QUERY_THROW); xChangesBatch->commitChanges(); } - catch (const css::uno::Exception& e) + catch (const css::uno::Exception&) { - SAL_WARN("extensions.config", - "ADsUserAccess: access to configuration data failed: " << e); + TOOLS_WARN_EXCEPTION("extensions.config", + "ADsUserAccess: access to configuration data failed:"); } } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index d88afef8a40c..877f3011d536 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -334,10 +334,10 @@ bool ImplInitAccessBridge() = css::accessibility::MSAAService::create(xContext); SAL_INFO("vcl", "got IAccessible2 bridge"); return true; - } catch (css::uno::DeploymentException & e) { - SAL_WARN( + } catch (css::uno::DeploymentException &) { + TOOLS_WARN_EXCEPTION( "vcl", - "got no IAccessible2 bridge" << e); + "got no IAccessible2 bridge"); return false; } } |