diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-07 14:44:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-10 11:18:17 +0200 |
| commit | 9d7ca4853773b4e679b8712d5c49413e67345918 (patch) | |
| tree | 49ef25e37a90cf5754bab491188cc19597324fba /tools | |
| parent | d074556e5a62d3b0029babcb02a3b7955a9eb084 (diff) | |
fix file and lineno info for DBG_UNHANDLED_EXCEPTION
which I broke in commit 863d38fbfa4fb4861e476828c46410602100919e
"move DBG_UNHANDLED_EXCEPTION out of line"
Change-Id: Ic30e985cc356d81013ced1ce74ec6c78469d9882
(cherry picked from commit 2cb247a12d682d7cda0483570b38b4469c360a94)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/debug/debug.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 3f950ca8dd54..49da3089805f 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -1589,7 +1589,7 @@ void DbgOutf( const sal_Char*, ... ) {} #if OSL_DEBUG_LEVEL > 0 -TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction) +TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo) { OString sMessage( "caught an exception!" ); sMessage += "\nin function:"; @@ -1628,7 +1628,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c } } sMessage += "\n"; - OSL_ENSURE( false, sMessage.getStr() ); + + SAL_DETAIL_LOG_FORMAT( + SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN, + "legacy.osl", fileAndLineNo, "%s", sMessage.getStr()); } #endif // OSL_DEBUG_LEVEL |