diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/SwNumberTree.hxx | 4 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 4 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/errhdl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fldbas.hxx | 4 | ||||
-rw-r--r-- | sw/inc/hints.hxx | 2 | ||||
-rw-r--r-- | sw/inc/index.hxx | 6 | ||||
-rw-r--r-- | sw/inc/ndhints.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndindex.hxx | 2 | ||||
-rw-r--r-- | sw/inc/node.hxx | 4 | ||||
-rw-r--r-- | sw/inc/numrule.hxx | 2 | ||||
-rw-r--r-- | sw/inc/pam.hxx | 2 | ||||
-rw-r--r-- | sw/inc/rolbck.hxx | 2 | ||||
-rw-r--r-- | sw/inc/shellio.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swtable.hxx | 12 | ||||
-rw-r--r-- | sw/inc/undobj.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewopt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/viscrs.hxx | 4 |
18 files changed, 32 insertions, 32 deletions
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 03815a265c18..7f4c88b6081c 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -385,7 +385,7 @@ public: // RTL_TEXTENCODING_ASCII_US), // int nDepth = -1) const; -#ifndef PRODUCT +#ifdef DBG_UTIL static unsigned long GetInstances(); unsigned long GetSerial(); #endif @@ -494,7 +494,7 @@ protected: */ mutable tSwNumberTreeChildren::iterator mItLastValid; -#ifndef PRODUCT +#ifdef DBG_UTIL /** Counter for the number of created instances. */ diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 4fae1ca69a6b..6e5102cb8fca 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -111,7 +111,7 @@ struct SwContentAtPos SW_NUMLABEL = 0x0200, // #i23726# SW_CONTENT_CHECK = 0x0400, // --> FME 2005-05-13 #i43742# <-- SW_SMARTTAG = 0x0800 -#ifndef PRODUCT +#ifdef DBG_UTIL ,SW_CURR_ATTRS = 0x4000 // nur zum Debuggen ,SW_TABLEBOXVALUE = 0x8000 // nur zum Debuggen #endif @@ -474,7 +474,7 @@ public: */ void Combine(); -#if defined( PRODUCT ) +#if !defined(DBG_UTIL) void SttCrsrMove() { ++nCrsrMove; StartAction(); } void EndCrsrMove( const BOOL bIdleEnd = FALSE ) { EndAction( bIdleEnd ); --nCrsrMove; } diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index a82ea0235359..46af5977369d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -509,7 +509,7 @@ private: bool mbColumnSelection : 1; // true: this content has bee created by a column selection // (clipboard docs only) -#ifndef PRODUCT +#ifdef DBG_UTIL bool mbXMLExport : 1; // TRUE: during XML export #endif @@ -1061,7 +1061,7 @@ public: inline void SetOLEPrtNotifyPending( bool bSet = true ); void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte -#ifndef PRODUCT +#ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; } #endif diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx index f9fae69e7358..3d7c8a19085d 100644 --- a/sw/inc/errhdl.hxx +++ b/sw/inc/errhdl.hxx @@ -30,7 +30,7 @@ #ifndef _ERRHDL_HXX #define _ERRHDL_HXX -#ifndef PRODUCT +#ifdef DBG_UTIL #include <tools/solar.h> #include <sal/types.h> diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 11213224844c..186ca702c8f0 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -278,7 +278,7 @@ protected: public: -#ifndef PRODUCT +#ifdef DBG_UTIL virtual ~SwFieldType(); #endif static const String& GetTypeStr( USHORT nTypeId ); @@ -337,7 +337,7 @@ public: // ResId USHORT Which() const -#ifdef PRODUCT +#ifndef DBG_UTIL { return pType->Which(); } #else ; // in fldbas.cxx implementiert diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index f1911ce7f0c1..83c3b114acc6 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -214,7 +214,7 @@ public: USHORT Count() const { return pChgSet->Count(); } void ClearItem( USHORT nWhichL = 0 ) -#ifdef PRODUCT +#ifndef DBG_UTIL { pChgSet->ClearItem( nWhichL ); } #else ; diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index 5a57724f2540..2efc3f285d7f 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -43,7 +43,7 @@ class SwIndex; class SwIndexReg; struct SwPosition; -#ifdef PRODUCT +#ifndef DBG_UTIL #define INLINE inline #else #define INLINE @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwIndex { friend class SwIndexReg; -#ifndef PRODUCT +#ifdef DBG_UTIL static int nSerial; int MySerial; #endif @@ -150,7 +150,7 @@ public: void MoveTo( SwIndexReg& rArr ); }; -#ifdef PRODUCT +#ifndef DBG_UTIL inline xub_StrLen SwIndex::operator++() { diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index ad4403d9f7e3..9a7d37c026fa 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -94,7 +94,7 @@ public: { return SwpHtStart::operator[](nIdx); } inline USHORT Count() const { return SwpHtStart::Count(); } -#ifndef PRODUCT +#ifdef DBG_UTIL BOOL Check() const; #endif }; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 0942621991e8..82153fa5b5e1 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwNodeIndex friend void SwNodes::DeRegisterIndex( SwNodeIndex& ); friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL ); -#ifndef PRODUCT +#ifdef DBG_UTIL static int nSerial; int MySerial; #endif diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 5aa259b68c06..4862dafc6aac 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry { friend class SwNodes; -#ifndef PRODUCT +#ifdef DBG_UTIL static long nSerial; long nMySerial; #endif @@ -114,7 +114,7 @@ protected: public: virtual ~SwNode(); -#ifndef PRODUCT +#ifdef DBG_UTIL long int GetSerial() const { return nMySerial; } #endif diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 9b3714c806bf..dfaa5101c01c 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -116,7 +116,7 @@ public: private: friend void _FinitCore(); -#ifndef PRODUCT +#ifdef DBG_UTIL long int nSerial; static long int nInstances; #endif diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 8b5af17f820c..df0502ba0cce 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -185,7 +185,7 @@ public: virtual void SetMark(); void DeleteMark() { pMark = pPoint; } -#ifdef PRODUCT +#ifndef DBG_UTIL void Exchange() { if(pPoint != pMark) diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx index f137b8b73e6c..8ba22f410262 100644 --- a/sw/inc/rolbck.hxx +++ b/sw/inc/rolbck.hxx @@ -72,7 +72,7 @@ class SwCharFmt; #include <IDocumentMarkAccess.hxx> // <-- -#ifndef PRODUCT +#ifdef DBG_UTIL class Writer; #define OUT_HSTR_HINT( name ) \ friend Writer& OutUndo_Hstr_ ## name( Writer&, const SwHstryHint& ); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 497426e83b4d..866bb36b79e3 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -538,7 +538,7 @@ public: inline SvStream& OutULong( ULONG nVal ) { return OutULong( Strm(), nVal ); } void SetStrm( SvStream& rStrm ) { pStrm = &rStrm; } -#ifdef PRODUCT +#ifndef DBG_UTIL SvStream& Strm() { return *pStrm; } #else SvStream& Strm(); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 1a62bb3d4dfd..c5e70fe30f11 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -38,7 +38,7 @@ #include <swtypes.hxx> #include <calbck.hxx> #include <swrect.hxx> -#ifdef PRODUCT +#ifndef DBG_UTIL #include <node.hxx> // fuer StartNode->GetMyIndex #else class SwStartNode; @@ -111,7 +111,7 @@ protected: BOOL bModifyLocked :1; BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel -#ifndef PRODUCT +#ifdef DBG_UTIL bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change #endif @@ -210,7 +210,7 @@ public: BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) { -#ifndef PRODUCT +#ifdef DBG_UTIL bDontChangeModel = true; #endif return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) : @@ -219,7 +219,7 @@ public: BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1, BOOL bSameHeight = FALSE ) { -#ifndef PRODUCT +#ifdef DBG_UTIL bDontChangeModel = true; #endif return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) : @@ -323,7 +323,7 @@ public: SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); -#ifndef PRODUCT +#ifdef DBG_UTIL void CheckConsistency() const; #endif }; @@ -412,7 +412,7 @@ public: const SwStartNode *GetSttNd() const { return pSttNd; } ULONG GetSttIdx() const -#ifdef PRODUCT +#ifndef DBG_UTIL { return pSttNd ? pSttNd->GetIndex() : 0; } #else ; diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 00053210553a..a7859234b773 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -106,7 +106,7 @@ namespace utl { class TransliterationWrapper; } -#ifndef PRODUCT +#ifdef DBG_UTIL class Writer; class SwUndo; #define OUT_UNDOBJ( name ) \ diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index d650d90cf08e..b3feded02ea1 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -175,7 +175,7 @@ protected: BYTE nTblDest; // Ziel fuer Tabellenhintergrund -#ifndef PRODUCT +#ifdef DBG_UTIL // korrespondieren zu den Angaben in ui/config/cfgvw.src BOOL bTest1 :1; // Test-Flag "Layout not loading" BOOL bTest2 :1; // Test-Flag "WYSIWYG++" @@ -417,7 +417,7 @@ public: USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; } void SetViewLayoutColumns( USHORT nNew ) { mnViewLayoutColumns = nNew; } -#ifndef PRODUCT +#ifdef DBG_UTIL // korrespondieren zu den Angaben in ui/config/cfgvw.src inline BOOL IsTest1() const { return bTest1; } inline void SetTest1( BOOL b ) { bTest1 = b; } diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 3f898a7a1718..01cdc5d4949a 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -172,7 +172,7 @@ public: // TRUE: an die Position kann der Cursor gesetzt werden virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; -#ifndef PRODUCT +#ifdef DBG_UTIL // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor virtual BOOL IsSelOvr( int eFlags = @@ -217,7 +217,7 @@ public: // TRUE: an die Position kann der Cursor gesetzt werden virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; -#ifndef PRODUCT +#ifdef DBG_UTIL // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor virtual BOOL IsSelOvr( int eFlags = |