diff options
109 files changed, 522 insertions, 562 deletions
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index c9a8979aea97..4775f2012ab4 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -347,7 +347,7 @@ public: */ const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL static unsigned long GetInstances(); unsigned long GetSerial(); #endif @@ -450,16 +450,16 @@ protected: */ mutable tSwNumberTreeChildren::const_iterator mItLastValid; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /** Counter for the number of created instances. */ - static unsigned long nInstances; + static unsigned long s_nInstances; /** Serial number. */ - unsigned long mnSerial; + unsigned long m_nSerial; #endif SwNumberTreeNode(const SwNumberTreeNode& ); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 780e1d8046ff..18f1fde2d97f 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -111,7 +111,7 @@ struct SwContentAtPos SW_CONTENT_CHECK = 0x0400, SW_SMARTTAG = 0x0800, SW_FORMCTRL = 0x1000 -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ,SW_CURR_ATTRS = 0x4000 // only for debugging ,SW_TABLEBOXVALUE = 0x8000 // only for debugging #endif @@ -451,7 +451,7 @@ public: */ void Combine(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SttCrsrMove(); void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ); #else diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 1ec37fdb4355..b090dfe0b52c 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -28,7 +28,7 @@ #ifndef __DBGOUTSW_HXX #define __DBGOUTSW_HXX -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include <boost/unordered_map.hpp> #include <tox.hxx> @@ -124,7 +124,7 @@ const char * dbg_out(const boost::unordered_map<tKey, tMember, fHashFunction> & } SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken); SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens); -#endif // OSL_DEBUG_LEVEL > 1 +#endif // DBG_UTIL #endif // __DBGOUTSW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 52991c192d88..7bd5e2dd9abe 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -471,7 +471,7 @@ private: bool mbColumnSelection : 1; // TRUE: this content has bee created by a column selection // (clipboard docs only) -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL bool mbXMLExport : 1; // sal_True: during XML export #endif @@ -1013,7 +1013,7 @@ public: inline void SetOLEPrtNotifyPending( bool bSet = true ); void PrtOLENotify( sal_Bool bAll ); //All or only marked -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; } #endif @@ -2036,7 +2036,7 @@ public: ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew) const; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL /** * Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default) * @since 3.5 diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 843edcf39e49..fb3de9c70412 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -316,7 +316,7 @@ public: // ResId sal_uInt16 Which() const -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ; // implemented in fldbas.cxx #else { return pType->Which(); } diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index fb064c19a468..4d07b8039c25 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -196,7 +196,7 @@ public: sal_uInt16 Count() const { return pChgSet->Count(); } void ClearItem( sal_uInt16 nWhichL = 0 ) -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ; #else { pChgSet->ClearItem( nWhichL ); } diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index 2a3a79231712..5c56fd5cf4ab 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -43,7 +43,7 @@ class SwIndex; class SwIndexReg; struct SwPosition; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define INLINE #else #define INLINE inline @@ -53,9 +53,9 @@ class SW_DLLPUBLIC SwIndex { friend class SwIndexReg; -#if OSL_DEBUG_LEVEL > 1 - static int nSerial; - int MySerial; +#ifdef DBG_UTIL + static int s_nSerial; + int m_nSerial; #endif xub_StrLen nIndex; @@ -142,7 +142,7 @@ public: // do not know a valid array (SwPaM/SwPosition!): struct EmptyIndexArray: rtl::Static< SwIndexReg, EmptyIndexArray > {}; -#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL < 2 +#ifndef DBG_UTIL inline xub_StrLen SwIndex::operator++() { diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 019ccb6a0f9a..389069b0c2ba 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -337,7 +337,7 @@ public: SwNode * DocumentSectionStartNode(SwNode * pNode) const; SwNode * DocumentSectionEndNode(SwNode * pNode) const; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL /** * Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default) * @since 3.5 diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 7a345792f5c5..8496aa015e91 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -115,7 +115,7 @@ public: { return m_HintStarts[nIdx]; } inline sal_uInt16 Count() const { return m_HintStarts.Count(); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL bool Check() const; #endif }; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 15bbfe57f55f..af1028b70607 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -44,9 +44,9 @@ class SW_DLLPUBLIC SwNodeIndex friend void SwNodes::DeRegisterIndex( SwNodeIndex& ); friend void SwNodes::RemoveNode( sal_uLong, sal_uLong, sal_Bool ); -#if OSL_DEBUG_LEVEL > 1 - static int nSerial; - int MySerial; +#ifdef DBG_UTIL + static int s_nSerial; + int m_nSerial; #endif SwNode* pNd; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index fc60c194c4ec..381fc85cd129 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -801,7 +801,7 @@ public: bool IsCollapse() const; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ); #endif diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 1ad155504eda..f50e65f3feb9 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -88,13 +88,14 @@ class SwOLENodes; // -------------------- // class SwNode // -------------------- -class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry +class SW_DLLPUBLIC SwNode + : private BigPtrEntry { friend class SwNodes; -#if OSL_DEBUG_LEVEL > 1 - static long nSerial; - long nMySerial; +#ifdef DBG_UTIL + static long s_nSerial; + long m_nSerial; #endif sal_uInt8 nNodeType; @@ -115,8 +116,8 @@ protected: public: virtual ~SwNode(); -#if OSL_DEBUG_LEVEL > 1 - long int GetSerial() const { return nMySerial; } +#ifdef DBG_UTIL + long GetSerial() const { return m_nSerial; } #endif sal_uInt16 GetSectionLevel() const; @@ -296,7 +297,7 @@ public: sal_uInt8 HasPrevNextLayNode() const; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL /** * Dumps the node structure to the given destination (file nodes.xml in the current directory by default) * @since 3.5 @@ -337,7 +338,7 @@ public: // Call ChkCondcoll to all ContentNodes of section. void CheckSectionCondColl() const; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ); #endif diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 0f7a3b23b796..35cbb4e513a0 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -115,9 +115,9 @@ public: private: friend void _FinitCore(); -#if OSL_DEBUG_LEVEL > 1 - long int nSerial; - static long int nInstances; +#if DBG_UTIL + long int m_nSerial; + static long int s_nInstances; #endif static SwNumFmt* aBaseFmts [ RULE_END ][ MAXLEVEL ]; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 5be01df54692..456d8ff108d1 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -226,7 +226,7 @@ public: m_pMark = m_pPoint; } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void Exchange(); #else diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 4239bf6fcb21..34219d41c206 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -36,14 +36,10 @@ #include <swrect.hxx> #include <frmfmt.hxx> -#if OSL_DEBUG_LEVEL > 1 -class SwStartNode; #include <memory> #include <boost/noncopyable.hpp> -#else -#include <node.hxx> // For StartNode->GetMyIndex. -#endif +class SwStartNode; class SwFmt; class Color; class SwTableFmt; @@ -111,8 +107,9 @@ protected: sal_Bool bModifyLocked :1; sal_Bool bNewModel :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel -#if OSL_DEBUG_LEVEL > 1 - bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change. +#ifdef DBG_UTIL + /// This is set by functions (like Merge()) to forbid a late model change. + bool m_bDontChangeModel; #endif sal_Bool IsModifyLocked(){ return bModifyLocked;} @@ -211,8 +208,8 @@ public: sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) { -#if OSL_DEBUG_LEVEL > 1 - bDontChangeModel = true; +#ifdef DBG_UTIL + m_bDontChangeModel = true; #endif return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) : OldMerge( pDoc, rBoxes, pMergeBox, pUndo ); @@ -220,8 +217,8 @@ public: sal_Bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1, sal_Bool bSameHeight = sal_False ) { -#if OSL_DEBUG_LEVEL > 1 - bDontChangeModel = true; +#ifdef DBG_UTIL + m_bDontChangeModel = true; #endif return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) : OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight ); @@ -326,7 +323,7 @@ public: sal_Bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); void RegisterToFormat( SwFmt& rFmt ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void CheckConsistency() const; #endif }; @@ -415,7 +412,7 @@ public: const SwStartNode *GetSttNd() const { return pSttNd; } sal_uLong GetSttIdx() const -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ; #else { return pSttNd ? pSttNd->GetIndex() : 0; } diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 27b6d5609507..0c3e15625d36 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -170,18 +170,18 @@ protected: sal_uInt8 nTblDest; // Destination for table background. -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // Corresponds to statements in ui/config/cfgvw.src. - sal_Bool bTest1 :1; // Test-flag "Layout not loading" - sal_Bool bTest2 :1; // Test-flag "WYSIWYG++" - sal_Bool bTest3 :1; // Test-flag "" - sal_Bool bTest4 :1; // Test-flag "WYSIWYG debug" - sal_Bool bTest5 :1; // Test-flag "No idle format" - sal_Bool bTest6 :1; // Test-flag "No screen adj" - sal_Bool bTest7 :1; // Test-flag "win format" - sal_Bool bTest8 :1; // Test-flag "" - static sal_Bool bTest9; // Test-Flag "DrawingLayerNotLoading" - sal_Bool bTest10 :1; // Test-Flag "Format by Input" + bool m_bTest1 :1; // Test-flag "Layout not loading" + bool m_bTest2 :1; // Test-flag "WYSIWYG++" + bool m_bTest3 :1; // Test-flag "" + bool m_bTest4 :1; // Test-flag "WYSIWYG debug" + bool m_bTest5 :1; // Test-flag "No idle format" + bool m_bTest6 :1; // Test-flag "No screen adj" + bool m_bTest7 :1; // Test-flag "win format" + bool m_bTest8 :1; // Test-flag "" + static bool s_bTest9; // Test-Flag "DrawingLayerNotLoading" + bool m_bTest10 :1; // Test-Flag "Format by Input" #endif public: @@ -412,28 +412,28 @@ public: sal_uInt16 GetViewLayoutColumns() const { return mnViewLayoutColumns; } void SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = nNew; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // Correspond to statements in ui/config/cfgvw.src. - inline sal_Bool IsTest1() const { return bTest1; } - inline void SetTest1( sal_Bool b ) { bTest1 = b; } - inline sal_Bool IsTest2() const { return bTest2; } - inline void SetTest2( sal_Bool b ) { bTest2 = b; } - inline sal_Bool IsTest3() const { return bTest3; } - inline void SetTest3( sal_Bool b ) { bTest3 = b; } - inline sal_Bool IsTest4() const { return bTest4; } - inline void SetTest4( sal_Bool b ) { bTest4 = b; } - inline sal_Bool IsTest5() const { return bTest5; } - inline void SetTest5( sal_Bool b ) { bTest5 = b; } - inline sal_Bool IsTest6() const { return bTest6; } - inline void SetTest6( sal_Bool b ) { bTest6 = b; } - inline sal_Bool IsTest7() const { return bTest7; } - inline void SetTest7( sal_Bool b ) { bTest7 = b; } - inline sal_Bool IsTest8() const { return bTest8; } - inline void SetTest8( sal_Bool b ) { bTest8 = b; } - static inline sal_Bool IsTest9() { return bTest9; } - static inline void SetTest9( sal_Bool b ) { bTest9 = b; } - inline sal_Bool IsTest10() const { return bTest10; } - inline void SetTest10( sal_Bool b ) { bTest10 = b; } + inline bool IsTest1() const { return m_bTest1; } + inline void SetTest1( bool b ) { m_bTest1 = b; } + inline bool IsTest2() const { return m_bTest2; } + inline void SetTest2( bool b ) { m_bTest2 = b; } + inline bool IsTest3() const { return m_bTest3; } + inline void SetTest3( bool b ) { m_bTest3 = b; } + inline bool IsTest4() const { return m_bTest4; } + inline void SetTest4( bool b ) { m_bTest4 = b; } + inline bool IsTest5() const { return m_bTest5; } + inline void SetTest5( bool b ) { m_bTest5 = b; } + inline bool IsTest6() const { return m_bTest6; } + inline void SetTest6( bool b ) { m_bTest6 = b; } + inline bool IsTest7() const { return m_bTest7; } + inline void SetTest7( bool b ) { m_bTest7 = b; } + inline bool IsTest8() const { return m_bTest8; } + inline void SetTest8( bool b ) { m_bTest8 = b; } + static inline bool IsTest9() { return s_bTest9; } + static inline void SetTest9( bool b ) { s_bTest9 = b; } + inline bool IsTest10() const { return m_bTest10; } + inline void SetTest10( bool b ) { m_bTest10 = b; } #endif inline sal_uInt16 GetZoom() const { return nZoom; } diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 0a0a913de2c4..bf6c829b3162 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -162,8 +162,7 @@ public: // sal_True: Cursor can be set to this position. virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL // For testing of UNO-Crsr behavior here the implementation at visible cursor. virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | @@ -205,8 +204,7 @@ public: // sal_True: Cursor can be set to this position. virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL // For testing of UNO-Crsr behavior here the implementation at visible cursor. virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 184f94c8273e..b333eac87fc7 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -36,8 +36,8 @@ using std::vector; using std::find; -#if OSL_DEBUG_LEVEL > 1 -unsigned long SwNumberTreeNode::nInstances = 0; +#ifdef DBG_UTIL +unsigned long SwNumberTreeNode::s_nInstances = 0; #endif SwNumberTreeNode::SwNumberTreeNode() @@ -50,9 +50,9 @@ SwNumberTreeNode::SwNumberTreeNode() { mItLastValid = mChildren.end(); -#if OSL_DEBUG_LEVEL > 1 - mnSerial = nInstances; - nInstances++; +#ifdef DBG_UTIL + m_nSerial = s_nInstances; + s_nInstances++; #endif } @@ -75,8 +75,8 @@ SwNumberTreeNode::~SwNumberTreeNode() OSL_ENSURE( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent."); -#if OSL_DEBUG_LEVEL > 1 - nInstances--; +#ifdef DBG_UTIL + s_nInstances--; #endif mpParent = (SwNumberTreeNode *) 0xdeadbeef; @@ -997,15 +997,15 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const return aItResult; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL unsigned long SwNumberTreeNode::GetInstances() { - return nInstances; + return s_nInstances; } unsigned long SwNumberTreeNode::GetSerial() { - return mnSerial; + return m_nSerial; } #endif diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index da097a79c0fd..8070941046a5 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -136,7 +136,7 @@ SwAttrSetChg::~SwAttrSetChg() } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwAttrSetChg::ClearItem( sal_uInt16 nWhch ) { diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index bff5760ca3f7..6dac54b80472 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -35,8 +35,8 @@ #include "index.hxx" -#if OSL_DEBUG_LEVEL > 1 -int SwIndex::nSerial = 0; +#ifdef DBG_UTIL +int SwIndex::s_nSerial = 0; #endif @@ -59,8 +59,8 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx) else ChgValue( *pArray->pFirst, nIdx ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } @@ -70,8 +70,8 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx ) { ChgValue( rIdx, rIdx.nIndex + nIdx ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } @@ -80,8 +80,8 @@ SwIndex::SwIndex( const SwIndex& rIdx ) : nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 ) { ChgValue( rIdx, rIdx.nIndex ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } @@ -306,7 +306,7 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff, } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /************************************************************************* |* SwIndex::operator++() diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index b6c88be06cff..3e0f134ea33e 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -34,7 +34,7 @@ SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define INCREMENT( nVar ) ++nVar #else #define INCREMENT( nVar ) @@ -44,8 +44,7 @@ SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*); |* SwCache::Check() |*************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL void SwCache::Check() { if ( !pRealFirst ) @@ -81,7 +80,7 @@ void SwCache::Check() } #endif -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK Check(); #else #define CHECK @@ -93,7 +92,7 @@ void SwCache::Check() SwCache::SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL , const rtl::OString &rNm #endif ) : @@ -103,83 +102,83 @@ SwCache::SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize pLast( 0 ), nMax( nInitSize ), nCurMax( nInitSize ) -#if OSL_DEBUG_LEVEL > 1 - , aName( rNm ), - nAppend( 0 ), - nInsertFree( 0 ), - nReplace( 0 ), - nGetSuccess( 0 ), - nGetFail( 0 ), - nToTop( 0 ), - nDelete( 0 ), - nGetSeek( 0 ), - nAverageSeekCnt( 0 ), - nFlushCnt( 0 ), - nFlushedObjects( 0 ), - nIncreaseMax( 0 ), - nDecreaseMax( 0 ) +#ifdef DBG_UTIL + , m_aName( rNm ) + , m_nAppend( 0 ) + , m_nInsertFree( 0 ) + , m_nReplace( 0 ) + , m_nGetSuccess( 0 ) + , m_nGetFail( 0 ) + , m_nToTop( 0 ) + , m_nDelete( 0 ) + , m_nGetSeek( 0 ) + , m_nAverageSeekCnt( 0 ) + , m_nFlushCnt( 0 ) + , m_nFlushedObjects( 0 ) + , m_nIncreaseMax( 0 ) + , m_nDecreaseMax( 0 ) #endif { } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL SwCache::~SwCache() { { - rtl::OStringBuffer sOut(aName); + rtl::OStringBuffer sOut(m_aName); sOut.append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of new entries: ")). - append(static_cast<sal_Int32>(nAppend)). + append(static_cast<sal_Int32>(m_nAppend)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of insert on free places: ")). - append(static_cast<sal_Int32>(nInsertFree)). + append(static_cast<sal_Int32>(m_nInsertFree)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of replacements: ")). - append(static_cast<sal_Int32>(nReplace)). + append(static_cast<sal_Int32>(m_nReplace)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of successful Get's: ")). - append(static_cast<sal_Int32>(nGetSuccess)). + append(static_cast<sal_Int32>(m_nGetSuccess)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of failed Get's: ")). - append(static_cast<sal_Int32>(nGetFail)). + append(static_cast<sal_Int32>(m_nGetFail)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number or reordering (LRU): ")). - append(static_cast<sal_Int32>(nToTop)). + append(static_cast<sal_Int32>(m_nToTop)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of suppressions: ")). - append(static_cast<sal_Int32>(nDelete)). + append(static_cast<sal_Int32>(m_nDelete)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of Get's without Index: ")). - append(static_cast<sal_Int32>(nGetSeek)). + append(static_cast<sal_Int32>(m_nGetSeek)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of Seek for Get without Index: ")). - append(static_cast<sal_Int32>(nAverageSeekCnt)). + append(static_cast<sal_Int32>(m_nAverageSeekCnt)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of Flush calls: " )). - append(static_cast<sal_Int32>(nFlushCnt)). + append(static_cast<sal_Int32>(m_nFlushCnt)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of flushed objects: ")). - append(static_cast<sal_Int32>(nFlushedObjects)). + append(static_cast<sal_Int32>(m_nFlushedObjects)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of Cache expansions: ")). - append(static_cast<sal_Int32>(nIncreaseMax)). + append(static_cast<sal_Int32>(m_nIncreaseMax)). append('\n'). append(RTL_CONSTASCII_STRINGPARAM( "Number of Cache reductions: ")). - append(static_cast<sal_Int32>(nDecreaseMax)). + append(static_cast<sal_Int32>(m_nDecreaseMax)). append('\n'); OSL_TRACE(sOut.getStr()); @@ -195,13 +194,13 @@ SwCache::~SwCache() void SwCache::Flush( const sal_uInt8 ) { - INCREMENT( nFlushCnt ); + INCREMENT( m_nFlushCnt ); SwCacheObj *pObj = pRealFirst; pRealFirst = pFirst = pLast = 0; SwCacheObj *pTmp; while ( pObj ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if ( pObj->IsLocked() ) { OSL_FAIL( "Flushing locked objects." ); @@ -229,7 +228,7 @@ void SwCache::Flush( const sal_uInt8 ) aFreePositions.push_back( pTmp->GetCachePos() ); *(pData + pTmp->GetCachePos()) = (void*)0; delete pTmp; - INCREMENT( nFlushedObjects ); + INCREMENT( m_nFlushedObjects ); } } } @@ -241,7 +240,7 @@ void SwCache::Flush( const sal_uInt8 ) void SwCache::ToTop( SwCacheObj *pObj ) { - INCREMENT( nToTop ); + INCREMENT( m_nToTop ); //Objekt aus der LRU-Kette ausschneiden und am Anfang einfuegen. if ( pRealFirst == pObj ) //pFirst wurde vom Aufrufer geprueft! @@ -316,11 +315,11 @@ SwCacheObj *SwCache::Get( const void *pOwner, const sal_uInt16 nIndex, ToTop( pRet ); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if ( pRet ) - ++nGetSuccess; + ++m_nGetSuccess; else - ++nGetFail; + ++m_nGetFail; #endif return pRet; @@ -333,19 +332,19 @@ SwCacheObj *SwCache::Get( const void *pOwner, const sal_Bool bToTop ) SwCacheObj *pRet = pRealFirst; while ( pRet && !pRet->IsOwner( pOwner ) ) { - INCREMENT( nAverageSeekCnt ); + INCREMENT( m_nAverageSeekCnt ); pRet = pRet->GetNext(); } if ( bToTop && pRet && pRet != pFirst ) ToTop( pRet ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if ( pRet ) - ++nGetSuccess; + ++m_nGetSuccess; else - ++nGetFail; - ++nGetSeek; + ++m_nGetFail; + ++m_nGetSeek; #endif return pRet; } @@ -408,7 +407,7 @@ void SwCache::DeleteObj( SwCacheObj *pObj ) void SwCache::Delete( const void *pOwner ) { - INCREMENT( nDelete ); + INCREMENT( m_nDelete ); SwCacheObj *pObj; if ( 0 != (pObj = Get( pOwner, sal_Bool(sal_False) )) ) DeleteObj( pObj ); @@ -429,14 +428,14 @@ sal_Bool SwCache::Insert( SwCacheObj *pNew ) if ( Count() < nCurMax ) { //Es ist noch Platz frei, also einfach einfuegen. - INCREMENT( nAppend ); + INCREMENT( m_nAppend ); nPos = Count(); SwCacheObjArr::C40_INSERT( SwCacheObj, pNew, nPos ); } else if ( !aFreePositions.empty() ) { //Es exitieren Platzhalter, also den letzten benutzen. - INCREMENT( nInsertFree ); + INCREMENT( m_nInsertFree ); const sal_uInt16 nFreePos = aFreePositions.size() - 1; nPos = aFreePositions[ nFreePos ]; *(pData + nPos) = pNew; @@ -444,7 +443,7 @@ sal_Bool SwCache::Insert( SwCacheObj *pNew ) } else { - INCREMENT( nReplace ); + INCREMENT( m_nReplace ); //Der letzte des LRU fliegt raus. SwCacheObj *pObj = pLast; @@ -543,16 +542,13 @@ SwCacheObj::~SwCacheObj() |* SwCacheObj::SetLock(), Unlock() |*************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL void SwCacheObj::Lock() { - OSL_ENSURE( nLock < UCHAR_MAX, "To many Locks for CacheObject." ); + OSL_ENSURE( nLock < UCHAR_MAX, "Too many Locks for CacheObject." ); ++nLock; } - - void SwCacheObj::Unlock() { OSL_ENSURE( nLock, "No more Locks available." ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 7f859ed0f34e..5377c7de9a2a 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -316,7 +316,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd ) } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwCrsrShell::SttCrsrMove() { @@ -1254,14 +1254,13 @@ static void lcl_CheckHiddenSection( SwNodeIndex& rIdx ) if( pSectNd && pSectNd->GetSection().IsHiddenFlag() ) { SwNodeIndex aTmp( *pSectNd ); -#if OSL_DEBUG_LEVEL > 1 const SwNode* pFrmNd = -#endif rIdx.GetNodes().FindPrvNxtFrmNode( aTmp, pSectNd->EndOfSectionNode() ); -#if OSL_DEBUG_LEVEL > 1 +#ifndef DBG_UTIL (void) pFrmNd; - OSL_ENSURE( pFrmNd, "keinen Node mit Frames gefunden" ); +#else + OSL_ENSURE( pFrmNd, "found no Node with Frames" ); #endif rIdx = aTmp; } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 2c11ea3b74ba..04d9c38c0e7d 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1342,7 +1342,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, if( !bRet && ( SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos #endif )) @@ -1388,7 +1388,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, // erzeuge aus der internen (fuer CORE) // die externe (fuer UI) Formel rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if( RES_BOXATR_VALUE == pItem->Which() ) rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE; else @@ -1422,7 +1422,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos ) { xub_StrLen n = aPos.nContent.GetIndex(); diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index a229fc55653d..5c841a926fb7 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -456,7 +456,7 @@ void SwPaM::SetMark() (*m_pMark) = (*m_pPoint); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwPaM::Exchange() { diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index ca168f035b72..138a053289ba 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -594,16 +594,13 @@ sal_Bool SwShellCrsr::UpDown( sal_Bool bUp, sal_uInt16 nCnt ) &GetPtPos(), GetShell()->GetUpDownX() ); } -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL // JP 05.03.98: To test the UNO-Crsr behavior here the implementation on the // visible cursor. - sal_Bool SwShellCrsr::IsSelOvr( int eFlags ) { return SwCursor::IsSelOvr( eFlags ); } - #endif // TRUE: The cursor can be set to the position. @@ -732,15 +729,13 @@ sal_Bool SwShellTableCrsr::IsInside( const Point& rPt ) const return sal_False; } -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL // JP 05.03.98: To test the UNO-Crsr behavior here the implementation on the // visible cursor. sal_Bool SwShellTableCrsr::IsSelOvr( int eFlags ) { return SwShellCrsr::IsSelOvr( eFlags ); } - #endif sal_Bool SwShellTableCrsr::IsAtValidPos( sal_Bool bPoint ) const diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index d595b5171df4..643184d00e36 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include <tools/string.hxx> #include <svl/poolitem.hxx> @@ -552,7 +552,7 @@ String lcl_dbg_out(const SwNode & rNode) aTmpStr += String::CreateFromInt32(rNode.GetIndex()); aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL aTmpStr += String(" serial=\"", RTL_TEXTENCODING_ASCII_US); aTmpStr += String::CreateFromInt32(rNode.GetSerial()); aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US); diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index c68a44fdf727..f841246b63ba 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -306,7 +306,7 @@ namespace sw { namespace mark MarkManager::MarkManager(SwDoc& rDoc) : m_pDoc(&rDoc) { } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void MarkManager::dumpFieldmarks( ) const { const_iterator_t pIt = m_vFieldmarks.begin(); diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 8163a4ec128f..4548b730b6d5 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -309,7 +309,7 @@ SwDoc::SwDoc() mbInsOnlyTxtGlssry = mbContains_MSVBasic = mbKernAsianPunctuation = -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL mbXMLExport = #endif mbApplyWorkaroundForB6375613 = diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 967bfc1a2080..11c6e6c64357 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star; TYPEINIT1(SwRedlineHint, SfxHint); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define _ERROR_PREFIX "redline table corrupted: " diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 220aa19cf260..8f1d281c67a5 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -387,8 +387,8 @@ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const } } -#if OSL_DEBUG_LEVEL > 1 -long int SwNumRule::nInstances = 0; +#ifdef DBG_UTIL +long int SwNumRule::s_nInstances = 0; #endif // handle new parameter <eDefaultNumberFormatPositionAndSpaceMode> @@ -412,8 +412,8 @@ SwNumRule::SwNumRule( const String& rNm, meDefaultNumberFormatPositionAndSpaceMode( eDefaultNumberFormatPositionAndSpaceMode ), msDefaultListId() { -#if OSL_DEBUG_LEVEL > 1 - nSerial = nInstances++; +#ifdef DBG_UTIL + m_nSerial = s_nInstances++; #endif if( !nRefCount++ ) // zum erstmal, also initialisiern @@ -514,8 +514,8 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule ) meDefaultNumberFormatPositionAndSpaceMode( rNumRule.meDefaultNumberFormatPositionAndSpaceMode ), msDefaultListId( rNumRule.msDefaultListId ) { -#if OSL_DEBUG_LEVEL > 1 - nSerial = nInstances++; +#ifdef DBG_UTIL + m_nSerial = s_nInstances++; #endif ++nRefCount; diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 8eab5a9cfe2d..03aab574ae24 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star::uno; using namespace ::com::sun::star; -#if OSL_DEBUG_LEVEL > 2 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) @@ -193,7 +193,7 @@ sal_Bool lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, typedef sal_Bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, sal_Bool ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); @@ -226,7 +226,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #define CHECKBOXWIDTH #define CHECKTABLELAYOUT -#endif +#endif // DBG_UTIL struct CR_SetLineHeight { @@ -3452,8 +3452,7 @@ void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam ) } } -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) { const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); @@ -3475,7 +3474,6 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) OSL_FAIL( "Boxen der Line zu klein/gross" ); } } - #endif _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 97709cd98e8f..ab489eb7241b 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -57,7 +57,7 @@ #include <poolfmt.hxx> #include <SwNodeNum.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx index 3b064674d7bd..fd862921125f 100644 --- a/sw/source/core/docnode/ndindex.cxx +++ b/sw/source/core/docnode/ndindex.cxx @@ -31,8 +31,8 @@ #include "ndindex.hxx" -#if OSL_DEBUG_LEVEL > 1 -int SwNodeIndex::nSerial = 0; +#ifdef DBG_UTIL +int SwNodeIndex::s_nSerial = 0; #endif @@ -65,8 +65,8 @@ SwNodeIndex::SwNodeIndex( SwNodes& rNds, sal_uLong nIdx ) { rNds.RegisterIndex( *this ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } @@ -80,8 +80,8 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff ) pNd = rIdx.pNd; pNd->GetNodes().RegisterIndex( *this ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } @@ -95,8 +95,8 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff ) pNd = (SwNode*)&rNd; pNd->GetNodes().RegisterIndex( *this ); -#if OSL_DEBUG_LEVEL > 1 - MySerial = ++nSerial; // nur in der nicht PRODUCT-Version +#ifdef DBG_UTIL + m_nSerial = ++s_nSerial; #endif } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 51538f6c29f3..06177a4176e6 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1028,8 +1028,8 @@ SwSectionNode::SwSectionNode(SwNodeIndex const& rIdx, rFmt.UnlockModify(); } -#if OSL_DEBUG_LEVEL > 1 -//Hier werden ueberfluessige SectionFrms entfernt +#ifdef DBG_UTIL +//remove superfluous SectionFrms SwFrm* SwClearDummies( SwFrm* pFrm ) { SwFrm* pTmp = pFrm; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 17bc9f204486..53c13e265163 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -96,7 +96,7 @@ #include <rootfrm.hxx> #include <fldupde.hxx> #include <switerator.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 8164bcfb6831..64fc1bbccb56 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -315,8 +315,8 @@ sal_uInt16 SwNode::GetSectionLevel() const |* *******************************************************************/ -#if OSL_DEBUG_LEVEL > 1 -long SwNode::nSerial = 0; +#ifdef DBG_UTIL +long SwNode::s_nSerial = 0; #endif SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType ) @@ -347,9 +347,9 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType ) pStartOfSection = (SwStartNode*)this; } -#if OSL_DEBUG_LEVEL > 1 - nMySerial = nSerial; - nSerial++; +#ifdef DBG_UTIL + m_nSerial = s_nSerial; + s_nSerial++; #endif } @@ -380,9 +380,9 @@ SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType ) pStartOfSection = (SwStartNode*)this; } -#if OSL_DEBUG_LEVEL > 1 - nMySerial = nSerial; - nSerial++; +#ifdef DBG_UTIL + m_nSerial = s_nSerial; + s_nSerial++; #endif } diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 52f61cea98df..0e723cef34c8 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -29,7 +29,7 @@ #include "doc.hxx" #include "ndtxt.hxx" -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL namespace { @@ -201,6 +201,6 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) writer.endElement(); } -#endif // OSL_DEBUG_LEVEL +#endif // DBG_UTIL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 72a3ba4a848c..3168b5c056e6 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -178,7 +178,7 @@ SwField::SwField(SwFieldType* pTyp, sal_uInt32 nFmt, sal_uInt16 nLng) : bIsAutomaticLanguage(sal_True), nFormat(nFmt) { - OSL_ENSURE( pTyp, "SwField: ungueltiger SwFieldType" ); + OSL_ENSURE( pTyp, "SwField: no SwFieldType" ); pType = pTyp; } @@ -190,10 +190,10 @@ SwField::~SwField() Beschreibung: Statt Umweg ueber den Typ --------------------------------------------------------------------*/ -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_uInt16 SwField::Which() const { - OSL_ENSURE(pType, "Kein Typ vorhanden"); + OSL_ENSURE(pType, "SwField: No FieldType"); return pType->Which(); } #endif diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 2581d55d22bf..1c917c79f939 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -45,7 +45,7 @@ namespace sw { namespace mark { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void dumpFieldmarks( ) const; #endif // IDocumentMarkAccess diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index d290e9c8c178..4106bbd19240 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -64,7 +64,7 @@ #define SNAP_FLYFRAMES 0x00000002 #define SNAP_TABLECONT 0x00000004 -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include "swtypes.hxx" diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index aad3c9f00787..7fe39f4b0c9f 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -94,23 +94,23 @@ class SwDrawTextInfo SwDrawTextInfo(); // nicht zulaessig public: -#if OSL_DEBUG_LEVEL > 1 - sal_Bool bPos : 1; // These flags should control, that the appropriate - sal_Bool bWrong : 1; // Set-function has been called before calling - sal_Bool bGrammarCheck : 1; // the Get-function of a member - sal_Bool bSize : 1; - sal_Bool bFnt : 1; - sal_Bool bHyph : 1; - sal_Bool bLeft : 1; - sal_Bool bRight : 1; - sal_Bool bKana : 1; - sal_Bool bOfst : 1; - sal_Bool bAscent: 1; - sal_Bool bSperr : 1; - sal_Bool bSpace : 1; - sal_Bool bNumberOfBlanks : 1; - sal_Bool bUppr : 1; - sal_Bool bDrawSp: 1; +#ifdef DBG_UTIL + bool m_bPos : 1; // These flags should control that the appropriate + bool m_bWrong : 1; // Set-function has been called before calling + bool m_bGrammarCheck : 1; // the Get-function of a member + bool m_bSize : 1; + bool m_bFnt : 1; + bool m_bHyph : 1; + bool m_bLeft : 1; + bool m_bRight : 1; + bool m_bKana : 1; + bool m_bOfst : 1; + bool m_bAscent: 1; + bool m_bSperr : 1; + bool m_bSpace : 1; + bool m_bNumberOfBlanks : 1; + bool m_bUppr : 1; + bool m_bDrawSp: 1; #endif SwDrawTextInfo( ViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI, @@ -157,12 +157,14 @@ public: bUpper = sal_False; bDrawSpace = sal_False; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // these flags control, whether the matching member variables have // been set by using the Set-function before they may be accessed // by their Get-function: - bPos = bWrong = bGrammarCheck = bSize = bFnt = bAscent = bSpace = bNumberOfBlanks = bUppr = - bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = bSperr = sal_False; + m_bPos = m_bWrong = m_bGrammarCheck = m_bSize = m_bFnt = m_bAscent = + m_bSpace = m_bNumberOfBlanks = m_bUppr = + m_bDrawSp = m_bLeft = m_bRight = m_bKana = m_bOfst = m_bHyph = + m_bSperr = false; #endif } @@ -198,16 +200,16 @@ public: const Point &GetPos() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bPos, "DrawTextInfo: Undefined Position" ); #endif return *pPos; } xub_StrLen *GetHyphPos() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bHyph, "DrawTextInfo: Undefined Hyph Position" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bHyph, "DrawTextInfo: Undefined Hyph Position" ); #endif return pHyphPos; } @@ -219,16 +221,16 @@ public: const SwWrongList* GetWrong() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bWrong, "DrawTextInfo: Undefined WrongList" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bWrong, "DrawTextInfo: Undefined WrongList" ); #endif return pWrong; } const SwWrongList* GetGrammarCheck() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" ); #endif return pGrammarCheck; } @@ -240,16 +242,16 @@ public: const Size &GetSize() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bSize, "DrawTextInfo: Undefined Size" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bSize, "DrawTextInfo: Undefined Size" ); #endif return *pSize; } SwFont* GetFont() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bFnt, "DrawTextInfo: Undefined Font" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bFnt, "DrawTextInfo: Undefined Font" ); #endif return pFnt; } @@ -271,8 +273,8 @@ public: xub_StrLen GetOfst() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bOfst, "DrawTextInfo: Undefined Offset" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bOfst, "DrawTextInfo: Undefined Offset" ); #endif return nOfst; } @@ -284,24 +286,24 @@ public: long GetLeft() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bLeft, "DrawTextInfo: Undefined left range" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bLeft, "DrawTextInfo: Undefined left range" ); #endif return nLeft; } long GetRight() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bRight, "DrawTextInfo: Undefined right range" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bRight, "DrawTextInfo: Undefined right range" ); #endif return nRight; } long GetKanaDiff() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bKana, "DrawTextInfo: Undefined kana difference" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bKana, "DrawTextInfo: Undefined kana difference" ); #endif return nKanaDiff; } @@ -313,8 +315,8 @@ public: sal_uInt16 GetAscent() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bAscent, "DrawTextInfo: Undefined Ascent" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bAscent, "DrawTextInfo: Undefined Ascent" ); #endif return nAscent; } @@ -326,8 +328,8 @@ public: long GetSperren() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bSperr, "DrawTextInfo: Undefined >Sperren<" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bSperr, "DrawTextInfo: Undefined >Sperren<" ); #endif return nSperren; } @@ -339,16 +341,16 @@ public: long GetSpace() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bSpace, "DrawTextInfo: Undefined Spacing" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bSpace, "DrawTextInfo: Undefined Spacing" ); #endif return nSpace; } xub_StrLen GetNumberOfBlanks() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" ); #endif return nNumberOfBlanks; } @@ -365,16 +367,16 @@ public: sal_Bool GetUpper() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bUppr, "DrawTextInfo: Undefined Upperflag" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bUppr, "DrawTextInfo: Undefined Upperflag" ); #endif return bUpper; } sal_Bool GetDrawSpace() const { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); #endif return bDrawSpace; } @@ -412,16 +414,16 @@ public: void SetPos( const Point &rNew ) { pPos = &rNew; -#if OSL_DEBUG_LEVEL > 1 - bPos = sal_True; +#ifdef DBG_UTIL + m_bPos = true; #endif } void SetHyphPos( xub_StrLen *pNew ) { pHyphPos = pNew; -#if OSL_DEBUG_LEVEL > 1 - bHyph = sal_True; +#ifdef DBG_UTIL + m_bHyph = true; #endif } @@ -433,16 +435,16 @@ public: void SetWrong( const SwWrongList* pNew ) { pWrong = pNew; -#if OSL_DEBUG_LEVEL > 1 - bWrong = sal_True; +#ifdef DBG_UTIL + m_bWrong = true; #endif } void SetGrammarCheck( const SwWrongList* pNew ) { pGrammarCheck = pNew; -#if OSL_DEBUG_LEVEL > 1 - bGrammarCheck = sal_True; +#ifdef DBG_UTIL + m_bGrammarCheck = true; #endif } @@ -454,16 +456,16 @@ public: void SetSize( const Size &rNew ) { pSize = &rNew; -#if OSL_DEBUG_LEVEL > 1 - bSize = sal_True; +#ifdef DBG_UTIL + m_bSize = true; #endif } void SetFont( SwFont* pNew ) { pFnt = pNew; -#if OSL_DEBUG_LEVEL > 1 - bFnt = sal_True; +#ifdef DBG_UTIL + m_bFnt = sal_True; #endif } @@ -480,32 +482,32 @@ public: void SetOfst( xub_StrLen nNew ) { nOfst = nNew; -#if OSL_DEBUG_LEVEL > 1 - bOfst = sal_True; +#ifdef DBG_UTIL + m_bOfst = true; #endif } void SetLeft( long nNew ) { nLeft = nNew; -#if OSL_DEBUG_LEVEL > 1 - bLeft = sal_True; +#ifdef DBG_UTIL + m_bLeft = true; #endif } void SetRight( long nNew ) { nRight = nNew; -#if OSL_DEBUG_LEVEL > 1 - bRight = sal_True; +#ifdef DBG_UTIL + m_bRight = true; #endif } void SetKanaDiff( long nNew ) { nKanaDiff = nNew; -#if OSL_DEBUG_LEVEL > 1 - bKana = sal_True; +#ifdef DBG_UTIL + m_bKana = true; #endif } @@ -517,8 +519,8 @@ public: void SetAscent( sal_uInt16 nNew ) { nAscent = nNew; -#if OSL_DEBUG_LEVEL > 1 - bAscent = sal_True; +#ifdef DBG_UTIL + m_bAscent = true; #endif } @@ -539,16 +541,16 @@ public: nSpace = nNew; nSperren = 0; } -#if OSL_DEBUG_LEVEL > 1 - bSpace = sal_True; - bSperr = sal_True; +#ifdef DBG_UTIL + m_bSpace = true; + m_bSperr = true; #endif } void SetNumberOfBlanks( xub_StrLen nNew ) { -#if OSL_DEBUG_LEVEL > 1 - bNumberOfBlanks = sal_True; +#ifdef DBG_UTIL + m_bNumberOfBlanks = true; #endif nNumberOfBlanks = nNew; } @@ -576,16 +578,16 @@ public: void SetUpper( sal_Bool bNew ) { bUpper = bNew; -#if OSL_DEBUG_LEVEL > 1 - bUppr = sal_True; +#ifdef DBG_UTIL + m_bUppr = true; #endif } void SetDrawSpace( sal_Bool bNew ) { bDrawSpace = bNew; -#if OSL_DEBUG_LEVEL > 1 - bDrawSp = sal_True; +#ifdef DBG_UTIL + m_bDrawSp = true; #endif } diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index ff474f621c5d..170064e1b1c9 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -167,7 +167,7 @@ public: virtual void CheckDirection( sal_Bool bVert ); virtual void Cut(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); #endif diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index c11f862d8278..606b92eaf043 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -52,9 +52,8 @@ class SwFntCache : public SwCache public: inline SwFntCache() : SwCache(50,50 -#if OSL_DEBUG_LEVEL > 1 - , rtl::OString( RTL_CONSTASCII_STRINGPARAM( - "Globaler Font-Cache pFntCache" )) +#ifdef DBG_UTIL + , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif ) {} diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index e0dfeecd6919..797bf293804b 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -261,8 +261,8 @@ class SwFrm: public SwClient, public SfxBroadcaster friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL ); friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow ); -#if OSL_DEBUG_LEVEL > 1 - //entfernt leere SwSectionFrms aus einer Kette +#ifdef DBG_UTIL + //removes empty SwSectionFrms from a chain friend SwFrm* SwClearDummies( SwFrm* pFrm ); #endif diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index f1585b51506f..c73682a8f705 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -72,7 +72,7 @@ class SwFtnFrm: public SwLayoutFrm //nicht rueckwaerts fliessen. // #i49383# - control unlock of position of lower anchored objects. bool mbUnlockPosOfLowerObjs : 1; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL protected: virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); @@ -89,7 +89,7 @@ public: sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // in a non pro version test if the attribute has the same // meaning which his reference is const SwCntntFrm *GetRef() const; diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 093ff61af563..d23d55eb307c 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -210,13 +210,13 @@ class SwLayIdle sal_Bool bPageValid; // Konnte die Seite alles validiert werden? sal_Bool bAllValid; // Konnte alles validiert werden? -#if OSL_DEBUG_LEVEL > 1 - sal_Bool bIndicator; +#ifdef DBG_UTIL + bool m_bIndicator; #endif #ifdef _LAYACT_CXX -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void ShowIdle( ColorData eName ); #endif diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx index 768a1611010b..e355f8b00054 100644 --- a/sw/source/core/inc/laycache.hxx +++ b/sw/source/core/inc/laycache.hxx @@ -70,7 +70,7 @@ public: return pImpl; } void UnlockImpl() { --nLockCount; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_Bool CompareLayout( const SwDoc& rDoc ) const; #endif }; diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index 4d5d3e8ac51c..1144a9dd3cee 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -49,8 +49,8 @@ class SwLayoutFrm: public SwFrm friend SwFrm* SaveCntnt( SwLayoutFrm *, SwFrm * ); friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow ); -#if OSL_DEBUG_LEVEL > 1 - //entfernt leere SwSectionFrms aus einer Kette +#ifdef DBG_UTIL + //removes empty SwSectionFrms from a chain friend SwFrm* SwClearDummies( SwFrm* pFrm ); #endif diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index fd48725bd6fd..788fc55e1f52 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -208,7 +208,7 @@ public: SwPrintData const*const pPrintData = NULL ) const; virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); #endif @@ -314,9 +314,8 @@ public: void InsertEmptySct( SwSectionFrm* pDel ); void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); } void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); } -#if OSL_DEBUG_LEVEL > 1 - // Wird zur Zeit nur fuer OSL_ENSURE( benutzt: - sal_Bool IsInDelList( SwSectionFrm* pSct ) const; // Ist der SectionFrm in der Liste enthalten? +#ifdef DBG_UTIL + bool IsInDelList( SwSectionFrm* pSct ) const; #endif diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 7dd98272e9b5..a89d8b825ed6 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -146,7 +146,7 @@ public: const sal_uInt8* pLevel = 0 ) const; sal_uInt8 DirType( const xub_StrLen nPos ) const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_uInt8 CompType( const xub_StrLen nPos ) const; #endif diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 6273764c9714..92cb1a994cc7 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -60,10 +60,6 @@ #include <vector> -#if OSL_DEBUG_LEVEL > 1 -#include <tools/string.hxx> -#endif - #ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> #endif @@ -91,29 +87,29 @@ class SwCache : public SwCacheObjArr void DeleteObj( SwCacheObj *pObj ); -#if OSL_DEBUG_LEVEL > 1 - rtl::OString aName; - long nAppend; //Anzahl der Eintragungen durch Erweiterung. - long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze. - long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt - long nGetSuccess; //Anzahl der Erfolgreichen Get's - long nGetFail; //Anzahl der nicht Erfolgreichen Get's - long nToTop; //Anzahl der Umsortierungen (LRU) - long nDelete; //Anzahl der Loeschungen (von Aussen) - long nGetSeek; //Anzahl der Get's ohne Index - long nAverageSeekCnt; //Anzahl der Seek's fuer alle Get's ohne Index - long nFlushCnt; //Anzahl von Flush-Aufrufen. - long nFlushedObjects; //Anzahl der wg. Flush vernichteten Objekte - long nIncreaseMax; //Anzahl Cache-Erweiterungen - long nDecreaseMax; //Anzahl Cache-Verkleinerungen - - void Check(); //Wird bei swcache.cxx mit DEBUG aktiv! +#ifdef DBG_UTIL + rtl::OString m_aName; + long m_nAppend; /// number of entries appended + long m_nInsertFree; /// number of entries inserted on freed position + long m_nReplace; /// number of LRU replacements + long m_nGetSuccess; + long m_nGetFail; + long m_nToTop; /// number of reordering (LRU) + long m_nDelete; /// number of explicit deletes + long m_nGetSeek; /// number of gets without index + long m_nAverageSeekCnt; /// number of seeks for all gets without index + long m_nFlushCnt; /// number of flush calls + long m_nFlushedObjects; + long m_nIncreaseMax; /// number of cache size increases + long m_nDecreaseMax; /// number of cache size decreases + + void Check(); #endif public: //nur sal_uInt8 hineinstecken!!! -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize, const rtl::OString &rNm ); ~SwCache(); @@ -194,7 +190,7 @@ public: inline sal_Bool IsLocked() const { return 0 != nLock; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void Lock(); void Unlock(); #else @@ -246,16 +242,16 @@ public: inline void SwCache::IncreaseMax( const sal_uInt16 nAdd ) { nCurMax = nCurMax + sal::static_int_cast< sal_uInt16 >(nAdd); -#if OSL_DEBUG_LEVEL > 1 - ++nIncreaseMax; +#ifdef DBG_UTIL + ++m_nIncreaseMax; #endif } inline void SwCache::DecreaseMax( const sal_uInt16 nSub ) { if ( nCurMax > nSub ) nCurMax = nCurMax - sal::static_int_cast< sal_uInt16 >(nSub); -#if OSL_DEBUG_LEVEL > 1 - ++nDecreaseMax; +#ifdef DBG_UTIL + ++m_nDecreaseMax; #endif } diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index e57b6f7b1a41..06c013b281fe 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -47,8 +47,8 @@ class SwFontCache : public SwCache public: inline SwFontCache() : SwCache(50,50 -#if OSL_DEBUG_LEVEL > 1 - , "Globaler AttributSet/Font-Cache pSwFontCache" +#ifdef DBG_UTIL + , "Global AttributSet/Font-Cache pSwFontCache" #endif ) {} diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index d99e368d861f..4bcb98f3f7dd 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -845,7 +845,7 @@ public: * class SvStatistics *************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL class SvStatistics { @@ -874,9 +874,9 @@ public: }; // globale Variable, implementiert in swfont.cxx -extern SvStatistics aSvStat; +extern SvStatistics g_SvStat; -#define SV_STAT(nWhich) ++(aSvStat.nWhich); +#define SV_STAT(nWhich) ++(g_SvStat.nWhich); inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream { @@ -893,7 +893,7 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; } #else #define SV_STAT(nWhich) -#endif /* DEBUG */ +#endif /* DBG_UTIL */ #endif diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 18a7f03fdb8d..1db055b9b1e1 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -65,7 +65,7 @@ sal_Bool lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara ); sal_Bool lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ); #endif diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index bb7fc866f3c2..c42be69359ef 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -402,7 +402,7 @@ public: inline sal_Bool IsSwapped() const { return bIsSwapped; } // Hat der Frm eine lokale Fussnote (in diesem Frm bzw. Follow)? -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//For testing SplitFrm #else void CalcFtnFlag(); @@ -662,10 +662,9 @@ inline SwTwips SwTxtFrm::GrowTst( const SwTwips nGrow ) return Grow( nGrow, sal_True ); } -#if OSL_DEBUG_LEVEL > 1 -// fragt auf WYSIWYG DBG ab +#ifdef DBG_UTIL +// query WYSIWYG DBG extern sal_Bool IsDbg( const SwTxtFrm *pFrm ); -#define DBTXTFRM aDbstream << "SwTxtFrm[" << GetFrmId() << "]" #endif inline sal_Bool SwTxtFrm::IsInside( const xub_StrLen nPos ) const diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 33e382342765..66e8d96a2605 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1158,7 +1158,7 @@ void SwCntntFrm::MakeAll() int nConsequetiveFormatsWithoutChange = 0; PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 ) -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL const SwDoc *pDoc = GetAttrSet()->GetDoc(); if( pDoc ) { diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index fc35a618066b..4117693501c7 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /* * Und hier die Beschreibung: @@ -106,12 +106,6 @@ * * --------------------------------------------------*/ -#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL <= 1 -#error Who broken the makefiles? -#endif - - - #include "dbg_lay.hxx" #include <tools/stream.hxx> @@ -890,6 +884,6 @@ void SwFrmChangesLeave::Leave() SwProtocol::Record( pFrm, PROT_FRMCHANGES, 0, &aFrm ); } -#endif // OSL_DEBUG_LEVEL > 1 +#endif // DBG_UTIL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 8207d182868e..e125aecad9dc 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1603,7 +1603,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, delete pPageMaker; if( pDoc->GetLayoutCache() ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL pDoc->GetLayoutCache()->CompareLayout( *pDoc ); #endif pDoc->GetLayoutCache()->ClearImpl(); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 51b4bfaa067e..4e26ed433f81 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -533,8 +533,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage ) } } -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { static sal_uInt16 nNum = USHRT_MAX; @@ -3125,7 +3124,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight() } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL //JP 15.10.2001: in a non pro version test if the attribute has the same // meaning which his reference is diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index a7c5036b5774..57bd8a2971f4 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2282,9 +2282,7 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly ) return sal_False; } - -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL /************************************************************************* |* |* void SwLayIdle::SwLayIdle() @@ -2292,9 +2290,9 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly ) |*************************************************************************/ void SwLayIdle::ShowIdle( ColorData eColorData ) { - if ( !bIndicator ) + if ( !m_bIndicator ) { - bIndicator = sal_True; + m_bIndicator = true; Window *pWin = pImp->GetShell()->GetWin(); if ( pWin ) { @@ -2312,7 +2310,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData ) #define SHOW_IDLE( ColorData ) ShowIdle( ColorData ) #else #define SHOW_IDLE( ColorData ) -#endif +#endif // DBG_UTIL /************************************************************************* |* @@ -2322,8 +2320,8 @@ void SwLayIdle::ShowIdle( ColorData eColorData ) SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : pRoot( pRt ), pImp( pI ) -#if OSL_DEBUG_LEVEL > 1 - , bIndicator( sal_False ) +#ifdef DBG_UTIL + , m_bIndicator( false ) #endif { pImp->pIdleAct = this; @@ -2504,13 +2502,13 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : if( pImp->IsAccessible() ) pImp->FireAccessibleEvents(); -#if OSL_DEBUG_LEVEL > 1 - if ( bIndicator && pImp->GetShell()->GetWin() ) +#ifdef DBG_UTIL + if ( m_bIndicator && pImp->GetShell()->GetWin() ) { // #i75172# Do not invalidate indicator, this may cause a endless loop. Instead, just repaint it // This should be replaced by an overlay object in the future, anyways. Since it's only for debug // purposes, it is not urgent. - bIndicator = false; SHOW_IDLE( COL_LIGHTGREEN ); + m_bIndicator = false; SHOW_IDLE( COL_LIGHTGREEN ); } #endif } diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index bbe4061b0a05..8d818fec4cfc 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -346,7 +346,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const { if( !pImpl ) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 9c7c5af77ca7..9e2c6ac33db3 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -366,7 +366,7 @@ void _FrmInit() { SwRootFrm::pVout = new SwLayVout(); SwCache *pNew = new SwCache( 100, 100 -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL , "static SwBorderAttrs::pCache" #endif ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 6f568f4dca15..3dc0288d101b 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -764,7 +764,7 @@ void SwSectionFrm::MakeAll() return; if( !pSection ) // Durch DelEmpty { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL OSL_ENSURE( getRootFrm()->IsInDelList( this ), "SectionFrm without Section" ); #endif if( !bValidPos ) @@ -1304,7 +1304,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { if( !pSection ) // Durch DelEmpty { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL OSL_ENSURE( getRootFrm()->IsInDelList( this ), "SectionFrm without Section" ); #endif bValidSize = bValidPos = bValidPrtArea = sal_True; @@ -2749,14 +2749,12 @@ void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct ) pDestroy->Remove( nPos ); } -#if OSL_DEBUG_LEVEL > 1 - -sal_Bool SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const +#ifdef DBG_UTIL +bool SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const { sal_uInt16 nPos; return ( pDestroy && pDestroy->Seek_Entry( pSct, &nPos ) ); } - #endif bool SwSectionFrm::IsBalancedSection() const diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx index 7c38aaa4430e..f1332f715b68 100644 --- a/sw/source/core/layout/unusedf.cxx +++ b/sw/source/core/layout/unusedf.cxx @@ -62,7 +62,7 @@ sal_Bool SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* ) const return sal_False; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwRootFrm::Cut() { diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index d769f3c4987a..7cf45183c1bf 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -184,7 +184,7 @@ void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn ) { Flush(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if( pShell->GetViewOptions()->IsTest3() ) { ++nCount; diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index d7d8d87b3390..c20402cebf32 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -50,7 +50,7 @@ #include <swtblfmt.hxx> #include <switerator.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) @@ -2101,7 +2101,7 @@ void SwTable::CleanUpBottomRowSpan( sal_uInt16 nDelLines ) } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL struct RowSpanCheck { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 1f456e7fee54..29b2f1971c04 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -69,7 +69,7 @@ #include <list> #include <switerator.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) @@ -1059,7 +1059,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL { // steht im tblrwcl.cxx extern void _CheckBoxWidth( const SwTableLine&, SwTwips ); @@ -1954,8 +1954,7 @@ sal_Bool SwTableBox::IsInHeadline( const SwTable* pTbl ) const return pTbl->GetTabLines()[ 0 ] == pLine; } -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL sal_uLong SwTableBox::GetSttIdx() const { return pSttNd ? pSttNd->GetIndex() : 0; diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 6b3b9cc59e55..aa253bcbc445 100755 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -655,7 +655,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm() } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL else if ( pFoll->GetValidPrtAreaFlag() || pFoll->GetValidSizeFlag() ) { @@ -753,7 +753,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL else { CalcFtnFlag( nTxtPos-1 ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 5d84e848b363..04a6705d57ae 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -108,15 +108,15 @@ namespace numfunc extern bool IsDefBulletFontUserDefined(); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // Test2: WYSIWYG++ // Test4: WYSIWYG debug -static sal_Bool bDbgLow = sal_False; +static bool g_bDbgLow = false; #endif -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_Bool SwTxtSizeInfo::IsOptCalm() const { return !GetOpt().IsTest3(); } -sal_Bool SwTxtSizeInfo::IsOptLow() const { return bDbgLow; } +sal_Bool SwTxtSizeInfo::IsOptLow() const { return g_bDbgLow; } sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); } sal_Bool SwTxtSizeInfo::IsOptTest1() const { return GetOpt().IsTest1(); } sal_Bool SwTxtSizeInfo::IsOptTest2() const { return GetOpt().IsTest2(); } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index b056612f8284..34845ec06072 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -74,7 +74,7 @@ class SwWrongList; #define DIR_RIGHT2LEFT 2 #define DIR_TOP2BOTTOM 3 -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define OPTCALM( rInf ) (rInf).IsOptCalm() #define OPTLOW( rInf ) (rInf).IsOptLow() #define OPTDBG( rInf ) (rInf).IsOptDbg() @@ -371,7 +371,7 @@ public: { return ( pKanaComp && nKanaIdx < pKanaComp->size() ) ? (*pKanaComp)[nKanaIdx] : 0; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL sal_Bool IsOptCalm() const; sal_Bool IsOptLow() const; sal_Bool IsOptDbg() const; @@ -414,7 +414,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo void _DrawBackBrush( const SwLinePortion &rPor ) const; protected: -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = ((SvxBrushItem*)-1);} #else diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index cb1209b893be..6f6c83429599 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -347,7 +347,7 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const return nNext; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /************************************************************************* * SwAttrIter::Dump() *************************************************************************/ diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index a9e5b455e1f9..a5cc8cc49ebb 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -126,7 +126,7 @@ public: inline SwAttrHandler& GetAttrHandler() { return aAttrHandler; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void Dump( SvStream &rOS ) const; #endif }; diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index f9d69365b2dc..23ccc27f2c2e 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -1588,7 +1588,7 @@ bool SwScriptInfo::IsInHiddenRange( const SwTxtNode& rNode, xub_StrLen nPos ) } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /************************************************************************* * SwScriptInfo::CompType(..) * returns the type of the compressed character @@ -1680,7 +1680,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen do { sal_uInt16 nType = GetCompType( nCompIdx ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL OSL_ENSURE( nType == CompType( nIdx ), "Gimme the right type!" ); #endif nCompLen = nCompLen + nIdx; diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 57ed53699870..e627dc255604 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -257,7 +257,7 @@ public: const SwLinePortion* _pDontConsiderPortion = NULL, const bool _bNoFlyCntPorAndLinePor = false ) const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void DebugPortions( SvStream &rOs, const XubString &rTxt, const xub_StrLen nStart ); //$ ostream @@ -371,7 +371,7 @@ public: const SwDropPortion *FindDropPortion() const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm ); #endif diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index da677f83c077..8ed4fba3cc1d 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -297,12 +297,11 @@ SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const return SwPosSize(); } -#if OSL_DEBUG_LEVEL > 1 - /************************************************************************* * virtual SwLinePortion::Check() *************************************************************************/ +#ifdef DBG_UTIL sal_Bool SwLinePortion::Check( SvStream &, SwTxtSizeInfo & ) //$ ostream { return sal_True; diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index d9b44dd7cee2..822d75e0f6dd 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -30,7 +30,7 @@ #include "possiz.hxx" // SwPosSize -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include <libxml/xmlwriter.h> #endif @@ -44,7 +44,7 @@ class SwPortionHandler; // Das CLASSIO-Makro implementiert die 'freischwebende' Funktion. // Auf diese Weise erhaelt man beide Vorteile: virtuelle Ausgabeoperatoren // und allgemeine Verwendbarkeit. -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const; #else #define OUTPUT_OPERATOR @@ -179,7 +179,7 @@ public: virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0; void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL virtual sal_Bool Check( SvStream &rOs, SwTxtSizeInfo &rInfo ); //$ ostream #endif diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index f7039e230bf0..ac21335bbbb1 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -75,7 +75,7 @@ #include <svx/svdoedge.hxx> #include "doc.hxx" -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include "viewopt.hxx" // SwViewOptions, nur zum Testen (Test2) #include "doc.hxx" #endif @@ -1730,7 +1730,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, delete pPolyPolygon; // UPPER_LOWER_TEST -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL const ViewShell* pTmpViewShell = pFmt->GetDoc()->GetCurrentViewShell(); if( pTmpViewShell ) { @@ -1803,8 +1803,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, * SwContourCache::ShowContour() * zeichnet die PolyPolygone des Caches zu Debugzwecken. *************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj, const Color& rClosedColor, const Color& rOpenColor ) { @@ -1852,8 +1851,7 @@ void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj, * SwTxtFly::ShowContour() * zeichnet die PolyPolygone des Caches zu Debugzwecken. *************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 - +#ifdef DBG_UTIL void SwTxtFly::ShowContour( OutputDevice* pOut ) { MSHORT nFlyCount; diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx index 1b0120e10a24..9b559bcb32d9 100644 --- a/sw/source/core/text/txtfly.hxx +++ b/sw/source/core/text/txtfly.hxx @@ -89,7 +89,7 @@ public: const SwTxtFrm* pFrm, const long nXPos, const sal_Bool bRight ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void ShowContour( OutputDevice* pOut, const SdrObject* pObj, const Color& rClosedColor, const Color& rOpenColor ); #endif @@ -190,7 +190,7 @@ public: mbIgnoreObjsInHeaderFooter = _bNew; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void ShowContour( OutputDevice* pOut ); #endif }; diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index e29fbe7c0f45..410878298dba 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -85,11 +85,6 @@ #include <IGrammarContact.hxx> #include <switerator.hxx> -#if OSL_DEBUG_LEVEL > 1 -#include <txtpaint.hxx> // DbgRect -extern const sal_Char *GetPrepName( const enum PrepareHint ePrep ); -#endif - TYPEINIT1( SwTxtFrm, SwCntntFrm ); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index c26259c3f465..1b81ec47aea8 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -102,7 +102,7 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn ) * CalcFtnFlag() *************************************************************************/ -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//For testing the SplitFrm #else void SwTxtFrm::CalcFtnFlag() @@ -116,7 +116,7 @@ void SwTxtFrm::CalcFtnFlag() const sal_uInt16 nSize = pHints->Count(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL const xub_StrLen nEnd = nStop != STRING_LEN ? nStop : GetFollow() ? GetFollow()->GetOfst() : STRING_LEN; #else @@ -1279,7 +1279,7 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset ) // einen kleineren Font eingestellt als der vom QuoVadis-Text ... CalcAdjustLine( pCurr ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if( OPTDBG( rInf ) ) { // aDbstream << "FormatQuoVadis:" << endl; diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index 79799512a998..1277ecf23d4b 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -73,7 +73,7 @@ void _TextInit() pFntCache = new SwFntCache; // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... } pSwFontCache = new SwFontCache; // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray } SwCache *pTxtCache = new SwCache( 250, 100 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL , "static SwTxtFrm::pTxtCache" #endif ); diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index d2be2ed2f7a9..4e53a582e15b 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include "viewsh.hxx" // IsDbg() #include "viewopt.hxx" // IsDbg() @@ -718,6 +718,6 @@ SvStream &SwDropPortion::operator<<( SvStream &rOs ) const //$ ostream #endif -#endif /* OSL_DEBUG_LEVEL */ +#endif /* DBG_UTIL */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index 452244959dc8..ac58ba941613 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -114,7 +114,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm, const Region aClipRegion( aRect ); pOut->SetClipRegion( aClipRegion ); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL static sal_Bool bDbg = sal_False; if( bDbg ) { diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 0a7a36beda48..752405e5d440 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -69,7 +69,7 @@ inline SwSaveClip::~SwSaveClip() Reset(); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /************************************************************************* * class SwDbgOut diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx index d0e0974f2ed0..a703f6fd4c8e 100644 --- a/sw/source/core/txtnode/ndhints.cxx +++ b/sw/source/core/txtnode/ndhints.cxx @@ -33,7 +33,7 @@ #include "ndhints.hxx" #include <txtatr.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include <pam.hxx> #endif @@ -234,7 +234,7 @@ void SwpHintsArray::DeleteAtPos( const sal_uInt16 nPos ) m_HintEnds.Remove( nEndPos ); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /************************************************************************* * SwpHintsArray::Check() @@ -375,7 +375,7 @@ bool SwpHintsArray::Check() const return true; } -#endif /* PRODUCT */ +#endif /* DBG_UTIL */ /************************************************************************* * SwpHintsArray::Resort() diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 547891a07a1f..dc5cca5db7e4 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -106,7 +106,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) // Leider ist das SwpHints nicht ganz wasserdicht: // Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge // und Verkettung sicherstellen zu muessen. -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_SWPHINTS(pNd) { if( pNd->GetpSwpHints() && \ !pNd->GetDoc()->IsInReading() ) \ pNd->GetpSwpHints()->Check(); } diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 1d87b9b91a51..54ef401f2ecf 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -78,9 +78,9 @@ #define FNT_ATM_HACK #endif -#if OSL_DEBUG_LEVEL > 1 -// globale Variable -SvStatistics aSvStat; +#ifdef DBG_UTIL +// global Variable +SvStatistics g_SvStat; #endif using namespace ::com::sun::star; @@ -1169,9 +1169,9 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos ) // used during painting of small capitals void SwDrawTextInfo::Shift( sal_uInt16 nDir ) { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" ); - OSL_ENSURE( bSize, "DrawTextInfo: Undefined Width" ); +#ifdef DBG_UTIL + OSL_ENSURE( m_bPos, "DrawTextInfo: Undefined Position" ); + OSL_ENSURE( m_bSize, "DrawTextInfo: Undefined Width" ); #endif const sal_Bool bBidiPor = ( GetFrm() && GetFrm()->IsRightToLeft() ) != diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index aad71adc23d3..18f6daaf3bc8 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -84,7 +84,7 @@ #include <algorithm> #include <map> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK Check(); #else #define CHECK diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 4e64a3ffca42..537d4ad48efc 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -71,14 +71,14 @@ #include <unochart.hxx> #include <switerator.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else #define CHECK_TABLE(t) #endif -#if OSL_DEBUG_LEVEL > 1 - void lcl_DebugRedline( const SwDoc* pDoc ); +#ifdef DBG_UTIL + void lcl_DebugRedline( const SwDoc* pDoc ); // docredln.cxx #define _DEBUG_REDLINE( pDoc ) lcl_DebugRedline( pDoc ); #else #define _DEBUG_REDLINE( pDoc ) diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index e2ed627baf83..f1b4b5f03aa3 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -643,7 +643,7 @@ void ViewShell::LayoutIdle() SET_CURR_SHELL( this ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL if( pOpt->IsTest5() ) return; #endif diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 1c3a9fb14adf..7beb6423eee0 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -63,7 +63,7 @@ #include <htmlnum.hxx> #include <wrthtml.hxx> #include <wrtswtbl.hxx> -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL #include <viewsh.hxx> #include <viewopt.hxx> #endif @@ -1213,11 +1213,13 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL + { ViewShell *pSh; rWrt.pDoc->GetEditShell( &pSh ); if ( pSh && pSh->GetViewOptions()->IsTest1() ) pLayout = 0; + } #endif if( pLayout && pLayout->IsExportable() ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index f22418d27bc1..94f1d28b5371 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -302,8 +302,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, nContextStAttrMin( 0 ), nOpenParaToken( 0 ), eJumpTo( JUMPTO_NONE ), -#if OSL_DEBUG_LEVEL > 1 - nContinue( 0 ), +#ifdef DBG_UTIL + m_nContinue( 0 ), #endif eParaAdjust( SVX_ADJUST_END ), bDocInitalized( sal_False ), @@ -436,8 +436,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, SwHTMLParser::~SwHTMLParser() { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( !nContinue, "DTOR im Continue - Das geht schief!!!" ); +#ifdef DBG_UTIL + OSL_ENSURE( !m_nContinue, "DTOR im Continue!" ); #endif sal_Bool bAsync = pDoc->IsInLoadAsynchron(); pDoc->SetInLoadAsynchron( sal_False ); @@ -585,9 +585,9 @@ SvParserState SwHTMLParser::CallParser() void SwHTMLParser::Continue( int nToken ) { -#if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" ); - nContinue++; +#ifdef DBG_UTIL + OSL_ENSURE(!m_nContinue, "Continue im Continue - not supposed to happen"); + m_nContinue++; #endif // Wenn der Import (vom SFX) abgebrochen wurde, wird ein Fehler @@ -611,8 +611,8 @@ void SwHTMLParser::Continue( int nToken ) bViewCreated = sal_True; pDoc->SetInLoadAsynchron( sal_True ); -#if OSL_DEBUG_LEVEL > 1 - nContinue--; +#ifdef DBG_UTIL + m_nContinue--; #endif return; @@ -920,8 +920,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) // wieder rekonstruieren. CallEndAction( sal_True ); -#if OSL_DEBUG_LEVEL > 1 - nContinue--; +#ifdef DBG_UTIL + m_nContinue--; #endif } diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index f218c361328b..18cdd98f962b 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -445,8 +445,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME, JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo; -#if OSL_DEBUG_LEVEL > 1 - sal_uInt16 nContinue; // Tiefe der Continue-Aufrufe +#ifdef DBG_UTIL + sal_uInt16 m_nContinue; // depth of Continue calls #endif SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 03ea26fb5a6a..2e5d21ab3ade 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -261,8 +261,8 @@ protected: sal_Bool bRelWidths : 1; // Breiten relativ ausgeben? sal_Bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen? -#if OSL_DEBUG_LEVEL > 1 - sal_Bool bGetLineHeightCalled : 1; +#ifdef DBG_UTIL + sal_Bool m_bGetLineHeightCalled : 1; #endif sal_Bool bColsOption : 1; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index da24e4ab0236..db16bad29296 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -112,9 +112,9 @@ sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox ) long SwWriteTable::GetLineHeight( const SwTableLine *pLine ) { -#if OSL_DEBUG_LEVEL > 1 - sal_Bool bOldGetLineHeightCalled = bGetLineHeightCalled; - bGetLineHeightCalled = sal_True; +#ifdef DBG_UTIL + sal_Bool bOldGetLineHeightCalled = m_bGetLineHeightCalled; + m_bGetLineHeightCalled = sal_True; #endif long nHeight = 0; @@ -132,7 +132,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine ) // ('hidden' rows) bUseLayoutHeights = bLayoutAvailable; /*sal_False;*/ -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL OSL_ENSURE( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout ungueltig?" ); #endif } @@ -766,8 +766,8 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth, nInnerBorder(0), nBaseWidth(nBWidth), nHeadEndRow(USHRT_MAX), nLeftSub(nLSub), nRightSub(nRSub), nTabWidth(nWidth), bRelWidths(bRel), bUseLayoutHeights(true), -#if OSL_DEBUG_LEVEL > 1 - bGetLineHeightCalled(false), +#ifdef DBG_UTIL + m_bGetLineHeightCalled(false), #endif bColsOption(false), bColTags(true), bLayoutExport(false), bCollectBorderWidth(true) @@ -793,8 +793,8 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) nInnerBorder(0), nBaseWidth(pLayoutInfo->GetWidthOption()), nHeadEndRow(0), nLeftSub(0), nRightSub(0), nTabWidth(pLayoutInfo->GetWidthOption()), bRelWidths(pLayoutInfo->HasPrcWidthOption()), bUseLayoutHeights(false), -#if OSL_DEBUG_LEVEL > 1 - bGetLineHeightCalled(false), +#ifdef DBG_UTIL + m_bGetLineHeightCalled(false), #endif bColsOption(pLayoutInfo->HasColsOption()), bColTags(pLayoutInfo->HasColTags()), bLayoutExport(true), diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index e3311605c636..5ef82118e5a4 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -98,7 +98,7 @@ namespace ww8 #endif } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL char sBuffer[256]; snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 7b20f601461a..76a74d094474 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -312,7 +312,7 @@ const SwRect & WW8TableNodeInfoInner::getRect() const return maRect; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string WW8TableNodeInfoInner::toString() const { static char buffer[256]; @@ -350,7 +350,7 @@ WW8TableNodeInfo::~WW8TableNodeInfo() { } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string WW8TableNodeInfo::toString() const { static char buffer[1024]; @@ -394,7 +394,7 @@ void WW8TableNodeInfo::setEndOfLine(bool bEndOfLine) WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setEndOfLine(bEndOfLine); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">" << toString() << "</endOfLine>" << ::std::endl; #endif @@ -405,7 +405,7 @@ void WW8TableNodeInfo::setEndOfCell(bool bEndOfCell) WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setEndOfCell(bEndOfCell); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">" << toString() << "</endOfCell>" << ::std::endl; #endif @@ -417,7 +417,7 @@ void WW8TableNodeInfo::setFirstInTable(bool bFirstInTable) pInner->setFirstInTable(bFirstInTable); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">" << toString() << "</firstInTable>" << ::std::endl; #endif @@ -430,7 +430,7 @@ void WW8TableNodeInfo::setVertMerge(bool bVertMerge) pInner->setVertMerge(bVertMerge); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">" << toString() << "</vertMerge>" << ::std::endl; #endif @@ -450,7 +450,7 @@ void WW8TableNodeInfo::setNext(WW8TableNodeInfo * pNext) { mpNext = pNext; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<setnext><from>" << toString() << "</from><to>" << pNext->toString() << "</to></setnext>" << ::std::endl; @@ -578,7 +578,7 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) { SwRect aRect = aTableCellInfo.getRect(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL static char sBuffer[1024]; ::std::clog << "<CellFrm>" << ::std::endl; @@ -615,7 +615,7 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) while (!bDone); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</CellFrm>" << ::std::endl; #endif } @@ -627,7 +627,7 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) void WW8TableInfo::processSwTable(const SwTable * pTable) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<processSwTable>" << ::std::endl; #endif @@ -638,7 +638,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) { pPrev = processSwTableByLayout(pTable); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL WW8TableCellGrid::Pointer_t pCellGrid(getCellGridForTable(pTable)); ::std::clog << pCellGrid->toString() << ::std::endl; #endif @@ -663,7 +663,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) pPrev->setNextNode(pEndNode); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</processSwTable>" << ::std::endl; #endif } @@ -674,7 +674,7 @@ WW8TableInfo::processTableLine(const SwTable * pTable, sal_uInt32 nRow, sal_uInt32 nDepth, WW8TableNodeInfo * pPrev) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\"" << nDepth << "\">" << ::std::endl; #endif @@ -690,7 +690,7 @@ WW8TableInfo::processTableLine(const SwTable * pTable, pPrev = processTableBox(pTable, pBox, nRow, n, nDepth, n == rBoxes.Count() - 1, pPrev); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</processTableLine>" << ::std::endl; #endif @@ -705,7 +705,7 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, sal_uInt32 nCell, sal_uInt32 nDepth) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<processTableBoxLines depth=\"" << nDepth << "\" row=\"" << nRow << "\" cell=\"" << nCell << "\">" << ::std::endl; #endif @@ -745,7 +745,7 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</processTableBoxLines>" << ::std::endl; #endif @@ -761,7 +761,7 @@ WW8TableInfo::processTableBox(const SwTable * pTable, bool bEndOfLine, WW8TableNodeInfo * pPrev) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<processTableBox row=\"" << nRow << "\" cell=\"" << nCell << "\" depth=\"" << nDepth << "\">" << ::std::endl; #endif @@ -840,7 +840,7 @@ WW8TableInfo::processTableBox(const SwTable * pTable, } } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</processTableBox>" << ::std::endl; #endif @@ -891,7 +891,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo pNodeInfo->setRect(*pRect); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << pNodeInfo->toString() << ::std::endl; #endif @@ -1011,7 +1011,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const return aRet; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string CellInfo::toString() const { static char sBuffer[256]; @@ -1037,7 +1037,7 @@ WW8TableNodeInfo * WW8TableInfo::reorderByLayout(const SwTable * pTable) WW8TableNodeInfo * pPrev = NULL; WW8TableCellGrid::Pointer_t pCellGrid = getCellGridForTable(pTable); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << pCellGrid->toString() << ::std::endl; #endif @@ -1111,7 +1111,7 @@ void WW8TableCellGrid::insert(const SwRect & rRect, void WW8TableCellGrid::addShadowCells() { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<addShadowCells>" << ::std::endl; #endif @@ -1119,7 +1119,7 @@ void WW8TableCellGrid::addShadowCells() while (aTopsIt != getRowTopsEnd()) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL long nTop = *aTopsIt; (void) nTop; #endif @@ -1184,7 +1184,7 @@ void WW8TableCellGrid::addShadowCells() ++aTopsIt; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "</addShadowCells>" << ::std::endl; #endif } @@ -1298,7 +1298,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() return pLastNodeInfo; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string WW8TableCellGrid::toString() { string sResult = "<WW8TableCellGrid>"; @@ -1440,7 +1440,7 @@ void WW8TableCellGridRow::insert(const CellInfo & rCellInfo) { m_pCellInfos->insert(rCellInfo); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::clog << "<gridRowInsert>" << rCellInfo.toString() << "</gridRowInsert>" diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index e93401d649b8..33b173d781c5 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -117,7 +117,7 @@ public: GridColsPtr getGridColsOfRow(AttributeOutputBase & rBase); RowSpansPtr getRowSpansOfRow(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string toString() const; #endif }; @@ -180,7 +180,7 @@ public: sal_uInt32 getCell() const; sal_uInt32 getRow() const; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string toString() const; #endif @@ -249,7 +249,7 @@ public: void addShadowCells(); WW8TableNodeInfo * connectCells(); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string toString(); #endif @@ -357,7 +357,7 @@ public: m_nFmtFrmWidth = nFmtFrmWidth; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL ::std::string toString() const; #endif }; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 6c0b88d5fb8f..c7c5fe5659f3 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3746,7 +3746,7 @@ void MSWordExportBase::OutputStartNode( const SwStartNode & rNode) void MSWordExportBase::OutputEndNode( const SwEndNode &rNode ) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // whoever has need of the missing function should go and implement it! // This piece of code always breaks builds... // ::std::clog << "<OutWW8_SwEndNode>" << dbg_out(&rNode) << ::std::endl; diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 41c45278988b..a059df978e43 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -334,7 +334,7 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const rVOpt.SetShdwCrsrFillMode( eMode ); } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL SwTestItem::SwTestItem( const SwTestItem& rTestItem ): SfxPoolItem(rTestItem) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 17d00e1257e5..e4c5448d20c4 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1734,7 +1734,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize) { diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 5524fe2c70fa..6e1ea23fa000 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -52,8 +52,8 @@ #include <editeng/acorrcfg.hxx> -#if OSL_DEBUG_LEVEL > 1 -sal_Bool SwViewOption::bTest9 = sal_False; //DrawingLayerNotLoading +#ifdef DBG_UTIL +bool SwViewOption::s_bTest9 = false; //DrawingLayerNotLoading #endif Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY); Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY); @@ -105,17 +105,17 @@ sal_Bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields && bIdle == rOpt.bIdle -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // correspond to the statements in ui/config/cfgvw.src - && bTest1 == rOpt.IsTest1() - && bTest2 == rOpt.IsTest2() - && bTest3 == rOpt.IsTest3() - && bTest4 == rOpt.IsTest4() - && bTest5 == rOpt.IsTest5() - && bTest6 == rOpt.IsTest6() - && bTest7 == rOpt.IsTest7() - && bTest8 == rOpt.IsTest8() - && bTest10 == rOpt.IsTest10() + && m_bTest1 == rOpt.IsTest1() + && m_bTest2 == rOpt.IsTest2() + && m_bTest3 == rOpt.IsTest3() + && m_bTest4 == rOpt.IsTest4() + && m_bTest5 == rOpt.IsTest5() + && m_bTest6 == rOpt.IsTest6() + && m_bTest7 == rOpt.IsTest7() + && m_bTest8 == rOpt.IsTest8() + && m_bTest10 == rOpt.IsTest10() #endif ; } @@ -212,10 +212,10 @@ SwViewOption::SwViewOption() : bIdle = true; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL // correspond to the statements in ui/config/cfgvw.src - bTest1 = bTest2 = bTest3 = bTest4 = - bTest5 = bTest6 = bTest7 = bTest8 = bTest10 = sal_False; + m_bTest1 = m_bTest2 = m_bTest3 = m_bTest4 = + m_bTest5 = m_bTest6 = m_bTest7 = m_bTest8 = m_bTest10 = false; #endif } @@ -248,16 +248,16 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; -#if OSL_DEBUG_LEVEL > 1 - bTest1 = rVOpt.bTest1 ; - bTest2 = rVOpt.bTest2 ; - bTest3 = rVOpt.bTest3 ; - bTest4 = rVOpt.bTest4 ; - bTest5 = rVOpt.bTest5 ; - bTest6 = rVOpt.bTest6 ; - bTest7 = rVOpt.bTest7 ; - bTest8 = rVOpt.bTest8 ; - bTest10 = rVOpt.bTest10 ; +#ifdef DBG_UTIL + m_bTest1 = rVOpt.m_bTest1; + m_bTest2 = rVOpt.m_bTest2; + m_bTest3 = rVOpt.m_bTest3; + m_bTest4 = rVOpt.m_bTest4; + m_bTest5 = rVOpt.m_bTest5; + m_bTest6 = rVOpt.m_bTest6; + m_bTest7 = rVOpt.m_bTest7; + m_bTest8 = rVOpt.m_bTest8; + m_bTest10 = rVOpt.m_bTest10; #endif } @@ -289,16 +289,16 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; -#if OSL_DEBUG_LEVEL > 1 - bTest1 = rVOpt.bTest1 ; - bTest2 = rVOpt.bTest2 ; - bTest3 = rVOpt.bTest3 ; - bTest4 = rVOpt.bTest4 ; - bTest5 = rVOpt.bTest5 ; - bTest6 = rVOpt.bTest6 ; - bTest7 = rVOpt.bTest7 ; - bTest8 = rVOpt.bTest8 ; - bTest10 = rVOpt.bTest10 ; +#ifdef DBG_UTIL + m_bTest1 = rVOpt.m_bTest1; + m_bTest2 = rVOpt.m_bTest2; + m_bTest3 = rVOpt.m_bTest3; + m_bTest4 = rVOpt.m_bTest4; + m_bTest5 = rVOpt.m_bTest5; + m_bTest6 = rVOpt.m_bTest6; + m_bTest7 = rVOpt.m_bTest7; + m_bTest8 = rVOpt.m_bTest8; + m_bTest10 = rVOpt.m_bTest10; #endif return *this; } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a46d03b57528..a01bc6ef7f90 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1652,7 +1652,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI break; case RID_SW_TP_OPTTEST_PAGE : case TP_OPTTEST_PAGE : -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL pRet = SwTestTabPage::Create; #endif break; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 78e9a69f2716..d3b5e0aaabe0 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -1362,7 +1362,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) sal_Bool bChkInsBlank = pQuickHlpData->bChkInsBlank; pQuickHlpData->bChkInsBlank = sal_False; -#if OSL_DEBUG_LEVEL > 0 +#ifdef DBG_UTIL if (rKEvt.GetKeyCode().GetCode() == KEY_F12) { if( rKEvt.GetKeyCode().IsShift()) diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index a49674d3936c..169c3e0bd4ac 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -143,7 +143,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK | SwContentAtPos::SW_SMARTTAG | -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL SwContentAtPos::SW_TABLEBOXVALUE | ( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) | #endif @@ -158,7 +158,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " )); sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula(); break; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL case SwContentAtPos::SW_TABLEBOXVALUE: { sTxt = rtl::OStringToOUString(rtl::OString::valueOf( diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 3181aeb64bac..68df6ea93d3a 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -37,7 +37,7 @@ class SwWriterApp; class SwModule; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL class SwTestTabPage; #endif class SwAddPrinterTabPage; @@ -203,7 +203,7 @@ public: void SetOn( sal_Bool bFlag ) { bOn = bFlag; } }; -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL /*--------OS 12.01.95 ----------------------------------- Item for settings dialog - test settings diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index a9c8eb901201..63403fc57c51 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -139,7 +139,7 @@ public: void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} void SetWrtShell(SwWrtShell* pSh); -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SetModified(sal_Bool bRepaint = sal_True); #else void SetModified(sal_Bool bRepaint = sal_True) diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 3e81dc8a811d..017720ae81d7 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -362,7 +362,7 @@ public: TabPage test settings for SW --------------------------------------------------------- */ -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL class SwTestTabPage : public SfxTabPage { @@ -395,7 +395,7 @@ private: DECL_LINK( AutoClickHdl, CheckBox * ); }; -#endif //PRODUCT +#endif // DBG_UTIL #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index a8bbe943399b..c09bcba07710 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -916,7 +916,7 @@ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG ) return 0; } -#if OSL_DEBUG_LEVEL > 1 +#ifdef DBG_UTIL void SwNumPositionTabPage::SetModified(sal_Bool bRepaint) { bModified = sal_True; @@ -926,7 +926,6 @@ void SwNumPositionTabPage::SetModified(sal_Bool bRepaint) aPreviewWIN.Invalidate(); } } - #endif SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, |