Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2900
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/2900/1
clean up DBG_ERRORn
Those were DBG_ERRORn before and were falsely changed to OSL_TRACE by me.
See:
1707a350af8a0909ae88c2b11deb714f8b2a93ff
533f89e49395bbc31baaab9ade46db934b383e14
Change-Id: I4f4188ba25b988128a539542f49797ea6985702e
---
M oox/source/export/SchXMLSeriesHelper.cxx
M oox/source/export/chartexport.cxx
M sal/inc/sal/log-areas.dox
M tools/source/generic/config.cxx
M vcl/source/window/accel.cxx
M vcl/source/window/winproc.cxx
6 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx
b/oox/source/export/SchXMLSeriesHelper.cxx
index 802fc01..a477771 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -26,8 +26,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/ustring.h>
-// header for define DBG_ERROR1
-#include <tools/debug.hxx>
#include <typeinfo>
@@ -201,8 +199,7 @@
catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
- OSL_TRACE( "Exception caught
SchXMLSeriesHelper::createOldAPISeriesPropertySet: %s",
- OUStringToOString( rEx.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
+ SAL_WARN( "oox", "Exception caught
SchXMLSeriesHelper::createOldAPISeriesPropertySet: " << rEx.Message );
}
}
@@ -240,8 +237,7 @@
{
(void)rEx; // avoid warning for pro build
- OSL_TRACE( "Exception caught
SchXMLSeriesHelper::createOldAPIDataPointPropertySet: %s",
- OUStringToOString( rEx.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
+ SAL_WARN( "oox", "Exception caught
SchXMLSeriesHelper::createOldAPIDataPointPropertySet: " << rEx.Message );
}
}
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 2d24717..5cab754 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2417,8 +2417,7 @@
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 @@
@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 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 @@
}
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 @@
break;
#ifdef DBG_UTIL
default:
- OSL_TRACE( "ImplWindowFrameProc(): unknown event (%lu)",
(sal_uLong)nEvent );
+ SAL_WARN( "vcl.layout", "ImplWindowFrameProc(): unknown event ("
<< nEvent << ")" );
break;
#endif
}
--
To view, visit https://gerrit.libreoffice.org/2900
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f4188ba25b988128a539542f49797ea6985702e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <tho...@arnhold.org>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
