summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-15 12:03:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-19 08:29:01 +0000
commitf573de2a956d91f67c384dbb54c980c117219032 (patch)
tree05c58829e18e4099b56c3edaf2c6477b065a1a5b /tools
parent6fd7c0c7714a90a6b99003b67a47b28b800cfdff (diff)
no need to wrap calls to SAL_INFO in #ifdef DBG_UTIL
Change-Id: Ic373a8f145f3f78c3f109e36a9c1dd9156f0dd75 Reviewed-on: https://gerrit.libreoffice.org/32034 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools')
-rw-r--r--tools/source/generic/config.cxx14
-rw-r--r--tools/source/stream/strmunx.cxx9
2 files changed, 0 insertions, 23 deletions
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index c76e8a60b93e..fc680c96beec 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -660,16 +660,12 @@ Config::Config( const OUString& rFileName )
mnDataUpdateId = 0;
mnLockCount = 1;
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::Config( " << maFileName << " )");
-#endif
}
Config::~Config()
{
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::~Config()" );
-#endif
Flush();
ImplFreeConfigData( mpData );
@@ -808,10 +804,8 @@ OString Config::ReadKey(const OString& rKey) const
OString Config::ReadKey(const OString& rKey, const OString& rDefault) const
{
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::ReadKey( " << rKey << " ) from " << GetGroup()
<< " in " << maFileName);
-#endif
// Update config data if necessary
if ( !mnLockCount )
@@ -836,10 +830,8 @@ 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.generic", "Config::WriteKey( " << rKey << ", " << rStr << " ) to "
<< GetGroup() << " in " << maFileName);
-#endif
// Update config data if necessary
if ( !mnLockCount || !mpData->mbRead )
@@ -939,9 +931,7 @@ void Config::DeleteKey(const OString& rKey)
sal_uInt16 Config::GetKeyCount() const
{
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName);
-#endif
// Update config data if necessary
if ( !mnLockCount )
@@ -967,10 +957,8 @@ sal_uInt16 Config::GetKeyCount() const
OString Config::GetKeyName(sal_uInt16 nKey) const
{
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey))
<< " ) from " << GetGroup() << " in " << maFileName);
-#endif
// search key and return name if found
ImplGroupData* pGroup = ImplGetGroup();
@@ -995,10 +983,8 @@ OString Config::GetKeyName(sal_uInt16 nKey) const
OString Config::ReadKey(sal_uInt16 nKey) const
{
-#ifdef DBG_UTIL
SAL_INFO("tools.generic", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey))
<< " ) from " << GetGroup() << " in " << maFileName);
-#endif
// Search key and return value if found
ImplGroupData* pGroup = ImplGetGroup();
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 206ec6c57255..1533cc5ea00c 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -307,9 +307,7 @@ SvFileStream::~SvFileStream()
std::size_t SvFileStream::GetData( void* pData, std::size_t nSize )
{
-#ifdef DBG_UTIL
SAL_INFO("tools", OString::number(static_cast<sal_Int64>(nSize)) << " Bytes from " << aFilename);
-#endif
sal_uInt64 nRead = 0;
if ( IsOpen() )
@@ -326,9 +324,7 @@ std::size_t SvFileStream::GetData( void* pData, std::size_t nSize )
std::size_t SvFileStream::PutData( const void* pData, std::size_t nSize )
{
-#ifdef DBG_UTIL
SAL_INFO("tools", OString::number(static_cast<sal_Int64>(nSize)) << " Bytes to " << aFilename);
-#endif
sal_uInt64 nWrite = 0;
if ( IsOpen() )
@@ -458,9 +454,7 @@ void SvFileStream::Open( const OUString& rFilename, StreamMode nOpenMode )
aFilename = rFilename;
-#ifdef DBG_UTIL
SAL_INFO("tools", aFilename);
-#endif
OUString aFileURL;
osl::DirectoryItem aItem;
@@ -554,10 +548,7 @@ void SvFileStream::Close()
if ( IsOpen() )
{
-#ifdef DBG_UTIL
SAL_INFO("tools", aFilename);
-#endif
-
Flush();
osl_closeFile( pInstanceData->rHandle );
pInstanceData->rHandle = nullptr;