diff options
| -rw-r--r-- | oox/source/export/chartexport.cxx | 3 | ||||
| -rw-r--r-- | sal/inc/sal/log-areas.dox | 1 | ||||
| -rw-r--r-- | tools/source/generic/config.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/window/accel.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 2 |
5 files changed, 6 insertions, 13 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ef3c01433364..4f4b83d53b49 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 3bb316f4c2a4..07c73998c93a 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 9d2d284defb8..dac13f01b863 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 261c4d01c4b4..653dac9c9429 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 b8f1cde4c7bc..98c856b3701f 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 } |