oox/source/export/chartexport.cxx | 3 +-- sal/inc/sal/log-areas.dox | 1 + tools/source/generic/config.cxx | 11 ++--------- vcl/source/window/accel.cxx | 2 +- vcl/source/window/winproc.cxx | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-)
New commits: commit 5ea8a48a3b26ac326ea5fe4a637a2d9b59cd2b94 Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Mar 21 10:19:50 2013 +0100 clean up DBG_ERRORn Those were DBG_ERRORn before and were falsely changed to OSL_TRACE by me. See: 1707a350af8a0909ae88c2b11deb714f8b2a93ff 533f89e49395bbc31baaab9ade46db934b383e14 Change-Id: I4f4188ba25b988128a539542f49797ea6985702e Reviewed-on: https://gerrit.libreoffice.org/2900 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ef3c014..4f4b83d 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2417,8 +2417,7 @@ void ChartExport::exportDataPoints( catch( const uno::Exception & rEx ) { (void)rEx; // avoid warning for pro build - OSL_TRACE( "Exception caught during Export of data point: %s", - OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + SAL_WARN( "oox", "Exception caught during Export of data point: " << rEx.Message ); } } else diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 3bb316f..07c7399 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -195,6 +195,7 @@ certain functionality. @li @c tools.debug @li @c tools.datetime +@li @c tools.generic @li @c tools.memtools @li @c tools.rc - resource manager @li @c tools.stream - SvStream class diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 9d2d284..dac13f0 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -537,15 +537,8 @@ static void ImplReadConfig( ImplConfigData* pData ) static void ImplWriteConfig( ImplConfigData* pData ) { -#ifdef DBG_UTIL - if ( DbgIsAssert() ) - { - if ( pData->mnTimeStamp != ImplSysGetConfigTimeStamp( pData->maFileName ) ) - { - OSL_TRACE( "Config overwrites modified configfile:\n %s", rtl::OUStringToOString(pData->maFileName, RTL_TEXTENCODING_UTF8).getStr() ); - } - } -#endif + SAL_WARN_IF( pData->mnTimeStamp != ImplSysGetConfigTimeStamp( pData->maFileName ), + "tools.generic", "Config overwrites modified configfile: " << pData->maFileName ); // Read config list from buffer sal_uIntPtr nBufLen; diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 261c4d0..653dac9 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -264,7 +264,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, } else if ( !mpData->maKeyMap.insert( std::make_pair( nCode, pEntry ) ).second ) { - OSL_TRACE( "Accelerator::InsertItem(): KeyCode (Key: %lx) already exists", nCode ); + SAL_WARN( "vcl.layout", "Accelerator::InsertItem(): KeyCode (Key: " << nCode << ") already exists" ); delete pEntry; } else diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index b8f1cde..98c856b 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2661,7 +2661,7 @@ long ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, break; #ifdef DBG_UTIL default: - OSL_TRACE( "ImplWindowFrameProc(): unknown event (%lu)", (sal_uLong)nEvent ); + SAL_WARN( "vcl.layout", "ImplWindowFrameProc(): unknown event (" << nEvent << ")" ); break; #endif } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits