diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-14 09:49:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-15 06:45:14 +0000 |
commit | d15b4e204598fc7e4c1682c4f10228e217575937 (patch) | |
tree | 1173b2725abac5f06bfd2e28965a95256283e6a4 /tools | |
parent | 14a0d26d6ae0ee59a685c254ec235fea81636475 (diff) |
teach sallogareas plugin to catch inconsistencies
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a
Reviewed-on: https://gerrit.libreoffice.org/32004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/datetime/tdate.cxx | 4 | ||||
-rw-r--r-- | tools/source/generic/config.cxx | 14 | ||||
-rw-r--r-- | tools/source/rc/resmgr.cxx | 4 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index e4556be8c1c0..0245de35c640 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -103,7 +103,7 @@ inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_Int16 nYear ) void Date::setDateFromDMY( sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear ) { - SAL_WARN_IF( nYear == 0, "tools","Date::setDateFromDMY - sure about 0 year? It's not in the calendar."); + SAL_WARN_IF( nYear == 0, "tools.datetime", "Date::setDateFromDMY - sure about 0 year? It's not in the calendar."); if (nYear < 0) mnDate = (static_cast<sal_Int32>( nYear ) * 10000) - @@ -125,7 +125,7 @@ void Date::SetDate( sal_Int32 nNewDate ) // static sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_Int16 nYear ) { - SAL_WARN_IF( nMonth < 1 || 12 < nMonth, "tools", "Date::GetDaysInMonth - nMonth out of bounds " << nMonth); + SAL_WARN_IF( nMonth < 1 || 12 < nMonth, "tools.datetime", "Date::GetDaysInMonth - nMonth out of bounds " << nMonth); if (nMonth < 1) nMonth = 1; else if (12 < nMonth) diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 8c801f46d87e..c76e8a60b93e 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -661,14 +661,14 @@ Config::Config( const OUString& rFileName ) mnLockCount = 1; #ifdef DBG_UTIL - SAL_INFO("tools", "Config::Config( " << maFileName << " )"); + SAL_INFO("tools.generic", "Config::Config( " << maFileName << " )"); #endif } Config::~Config() { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::~Config()" ); + SAL_INFO("tools.generic", "Config::~Config()" ); #endif Flush(); @@ -809,7 +809,7 @@ OString Config::ReadKey(const OString& rKey) const OString Config::ReadKey(const OString& rKey, const OString& rDefault) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::ReadKey( " << rKey << " ) from " << GetGroup() + SAL_INFO("tools.generic", "Config::ReadKey( " << rKey << " ) from " << GetGroup() << " in " << maFileName); #endif @@ -837,7 +837,7 @@ OString Config::ReadKey(const OString& rKey, const OString& rDefault) const void Config::WriteKey(const OString& rKey, const OString& rStr) { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::WriteKey( " << rKey << ", " << rStr << " ) to " + SAL_INFO("tools.generic", "Config::WriteKey( " << rKey << ", " << rStr << " ) to " << GetGroup() << " in " << maFileName); #endif @@ -940,7 +940,7 @@ void Config::DeleteKey(const OString& rKey) sal_uInt16 Config::GetKeyCount() const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName); + SAL_INFO("tools.generic", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName); #endif // Update config data if necessary @@ -968,7 +968,7 @@ sal_uInt16 Config::GetKeyCount() const OString Config::GetKeyName(sal_uInt16 nKey) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey)) + SAL_INFO("tools.generic", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); #endif @@ -996,7 +996,7 @@ OString Config::GetKeyName(sal_uInt16 nKey) const OString Config::ReadKey(sal_uInt16 nKey) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey)) + SAL_INFO("tools.generic", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); #endif diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 230eb987d3e2..4670528609b7 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -161,7 +161,7 @@ ResMgrContainer::~ResMgrContainer() { for( std::pair< OUString, ContainerElement > const & rPair : m_aResFiles ) { - SAL_INFO("tools", "Resource file " << rPair.second.aFileURL << " loaded " << rPair.second.nLoadCount << " times"); + SAL_INFO("tools.rc", "Resource file " << rPair.second.aFileURL << " loaded " << rPair.second.nLoadCount << " times"); delete rPair.second.pResMgr; } } @@ -1237,7 +1237,7 @@ ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource* pResourc ResMgrContainer::get().freeResMgr( pRes ); return nullptr; } - SAL_INFO("tools", "trying fallback: " << pRes->aFileName ); + SAL_INFO("tools.rc", "trying fallback: " << pRes->aFileName ); pFallback = new ResMgr( pRes ); pFallback->pOriginalResMgr = this; // try to recreate the resource stack diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index d778180c4594..350ac64ecbcb 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -106,7 +106,7 @@ inline static void SwapDouble( double& r ) { if( sizeof(double) != 8 ) { - SAL_WARN( "tools", "Can only swap 8-Byte-doubles\n" ); + SAL_WARN( "tools.stream", "Can only swap 8-Byte-doubles\n" ); } else { @@ -1983,7 +1983,7 @@ OString read_uInt8s_ToOString(SvStream& rStrm, std::size_t nLen) //alloc a (ref-count 1) rtl_String of the desired length. //rtl_String's buffer is uninitialized, except for null termination pStr = rtl_string_alloc(sal::static_int_cast<sal_Int32>(nLen)); - SAL_WARN_IF(!pStr, "tools", "allocation failed"); + SAL_WARN_IF(!pStr, "tools.stream", "allocation failed"); if (pStr) { std::size_t nWasRead = rStrm.ReadBytes(pStr->buffer, nLen); @@ -2012,7 +2012,7 @@ OUString read_uInt16s_ToOUString(SvStream& rStrm, std::size_t nLen) //alloc a (ref-count 1) rtl_uString of the desired length. //rtl_String's buffer is uninitialized, except for null termination pStr = rtl_uString_alloc(sal::static_int_cast<sal_Int32>(nLen)); - SAL_WARN_IF(!pStr, "tools", "allocation failed"); + SAL_WARN_IF(!pStr, "tools.stream", "allocation failed"); if (pStr) { std::size_t nWasRead = rStrm.ReadBytes(pStr->buffer, nLen*2)/2; |