diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-24 21:06:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-25 12:35:30 +0200 |
| commit | dd982d58dfe4f773a1cd5dbd8d376837316f0bfb (patch) | |
| tree | 7e41ff2985efe77abf3b947bc7d61d3357044cd0 /sc | |
| parent | 5f32957bc31a4676f2321c5a9a9e6945490861e4 (diff) | |
excel filter headers: replace OSL_DEBUG_LEVEL with DBG_UTIL
Just wasted half an hour trying to track down a crash in sc unit test
that was apparently caused by different object files being compiled
with different OSL_DEBUG_LEVELs and thus some having XclDebugObjCounter
and some not.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/tokstack.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlroot.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/tokstack.hxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlroot.hxx | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index ba2ccafb6188..ca2cc825ea20 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -421,9 +421,9 @@ void TokenPool::GetElement( const sal_uInt16 nId ) void TokenPool::GetElementRek( const sal_uInt16 nId ) { -#if OSL_DEBUG_LEVEL > 0 - nRek++; - OSL_ENSURE( nRek <= nP_Id, "*TokenPool::GetElement(): Rekursion loopt!?" ); +#ifdef DBG_UTIL + m_nRek++; + OSL_ENSURE(m_nRek <= nP_Id, "*TokenPool::GetElement(): recursion loop!?"); #endif OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElementRek(): Id zu gross!?" ); @@ -537,8 +537,8 @@ void TokenPool::GetElementRek( const sal_uInt16 nId ) } -#if OSL_DEBUG_LEVEL > 0 - nRek--; +#ifdef DBG_UTIL + m_nRek--; #endif } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index cfd88057b503..6f088f4b63a2 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -75,7 +75,7 @@ using namespace ::com::sun::star; // Global data ================================================================ -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL XclDebugObjCounter::~XclDebugObjCounter() { OSL_ENSURE( mnObjCnt == 0, "XclDebugObjCounter::~XclDebugObjCounter - wrong root object count" ); diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 29a2a130f05b..550f9e3a9c94 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -177,8 +177,8 @@ class TokenPool sal_uInt16 nElementAkt; static const sal_uInt16 nScTokenOff;// Offset fuer SC-Token -#if OSL_DEBUG_LEVEL > 0 - sal_uInt16 nRek; // Rekursionszaehler +#ifdef DBG_UTIL + sal_uInt16 m_nRek; // recursion counter #endif ScTokenArray* pScToken; // Tokenbastler @@ -385,8 +385,8 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) if( nId ) {//...nur wenn nId > 0! -#if OSL_DEBUG_LEVEL > 0 - nRek = 0; +#ifdef DBG_UTIL + m_nRek = 0; #endif GetElement( ( sal_uInt16 ) nId - 1 ); } diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 0a652baeb1c9..07d996d63750 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -50,7 +50,7 @@ class XclTokenArray; // Global data ================================================================ -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL /** Counts the number of created root objects. */ struct XclDebugObjCounter { @@ -75,7 +75,7 @@ struct RootData;//! /** Stores global buffers and data needed elsewhere in the Excel filters. */ struct XclRootData -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL : public XclDebugObjCounter #endif { |