mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

Browse Source 
I removed OSL_DEBUG_LEVEL > 1 conditionals and replaced them with
OSL_DEBUG_LEVEL > 0 as suggested in easy hack

Change-Id: I6495bf203365356e0969a057f5238c2343931d2b
Reviewed-on: https://gerrit.libreoffice.org/23061
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Rohan Kumar
2016-03-09 16:07:44 +05:30
committed by Björn Michaelsen
parent 2e0c1e03e8
commit 004c233d30
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sot/source/sdstor/ucbstorage.cxx
View File

@@ -74,8 +74,7 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::sdbc;
using namespace ::ucbhelper;
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#if OSL_DEBUG_LEVEL > 0
static int nOpenFiles=0;
static int nOpenStreams=0;
#endif
@@ -120,7 +119,7 @@ FileStreamWrapper_Impl::~FileStreamWrapper_Impl()
if ( m_pSvStream )
{
delete m_pSvStream;
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
--nOpenFiles;
#endif
}
@@ -225,7 +224,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( NotConnectedException,
::osl::MutexGuard aGuard( m_aMutex );
checkConnected();
DELETEZ( m_pSvStream );
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
--nOpenFiles;
#endif
::utl::UCBContentHelper::Kill( m_aURL );
@@ -288,7 +287,7 @@ void FileStreamWrapper_Impl::checkConnected()
if ( !m_pSvStream )
{
m_pSvStream = ::utl::UcbStreamHelper::CreateStream( m_aURL, STREAM_STD_READ );
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
++nOpenFiles;
#endif
}
@@ -729,7 +728,7 @@ bool UCBStorageStream_Impl::Init()
m_aTempURL = ::utl::TempFile().GetURL();
m_pStream = ::utl::UcbStreamHelper::CreateStream( m_aTempURL, STREAM_STD_READWRITE, true /* bFileExists */ );
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
++nOpenFiles;
#endif
@@ -1206,7 +1205,7 @@ bool UCBStorageStream_Impl::Clear()
void UCBStorageStream_Impl::Free()
{
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
if ( m_pStream )
{
if ( !m_aTempURL.isEmpty() )
@@ -2253,9 +2252,9 @@ sal_Int16 UCBStorage_Impl::Commit()
}
else
{
#if OSL_DEBUG_LEVEL > 1
fprintf ( stderr, "Files: %i\n", nOpenFiles );
fprintf ( stderr, "Streams: %i\n", nOpenStreams );
#if OSL_DEBUG_LEVEL > 0
SAL_INFO("sot", "Files: " << nOpenFiles);
SAL_INFO("sot", "Streams: " << nOpenStreams);
#endif
// force writing
Any aAny;