#i103452#: replace PRODUCT by !DBG_UTIL; replace assert by OSL_ASSERT where possible

author: Mathias Bauer <mba@openoffice.org> 2009-07-10 14:03:42 +0200
committer: Mathias Bauer <mba@openoffice.org> 2009-07-10 14:03:42 +0200
commit: b2bebad78498c79c2a55ae5cf4ee947070c1e21b (patch)
tree: b03ee0382969abb7cbe842a085c2c129a186eca0 /sw
parent: bc3bba74e94d7c1e0f22e9c14f739683200713ad (diff)
166 files changed, 409 insertions, 409 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 =
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 0c6106461f49..8f9caf5f022b 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -39,7 +39,7 @@
 using std::vector;
 using std::find;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 unsigned long SwNumberTreeNode::nInstances = 0;
 #endif
 
@@ -55,7 +55,7 @@ SwNumberTreeNode::SwNumberTreeNode()
 {
     mItLastValid = mChildren.end();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     mnSerial = nInstances;
     nInstances++;
 #endif
@@ -80,7 +80,7 @@ SwNumberTreeNode::~SwNumberTreeNode()
 
     ASSERT( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nInstances--;
 #endif
 
@@ -1108,7 +1108,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
 //  return aStr;
 //}
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 unsigned long SwNumberTreeNode::GetInstances()
 {
     return nInstances;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a9ec7b047da8..a0d8053574ae 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -100,12 +100,12 @@ class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl
 {
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool mbLocked;
 #endif
 
     SwAccessibleContextMap_Impl()
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         : mbLocked( sal_False )
 #endif
     {}
@@ -227,11 +227,11 @@ class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
 
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool mbLocked;
 #endif
     SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         : mbLocked( sal_False )
 #endif
     {
@@ -1009,7 +1009,7 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         vos::OGuard aGuard( maMutex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !mpFrmMap || mpFrmMap->empty(),
                 "Frame map should be empty after disposing the root frame" );
         if( mpFrmMap )
@@ -1062,7 +1062,7 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         vos::OGuard aGuard( maEventMutex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !(mpEvents || mpEventMap), "pending events" );
         if( mpEvents )
         {
@@ -1101,12 +1101,12 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
         if( !mpFrmMap )
         {
             mpFrmMap = new SwAccessibleContextMap_Impl;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             mpFrmMap->mbLocked = sal_False;
 #endif
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( !mpFrmMap->mbLocked, "Map is locked" );
         mpFrmMap->mbLocked = sal_True;
 #endif
@@ -1138,7 +1138,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
             }
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         mpFrmMap->mbLocked = sal_False;
 #endif
     }
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 03b82378df53..fb3c2ff37c13 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -38,7 +38,7 @@
 #include <swcache.hxx>
 #include <swfntcch.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <unotextmarkup.hxx>
 #endif
 
@@ -211,7 +211,7 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
 
     LockModify();
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     bInModify = TRUE;
 #else
     if( !pOldValue )
@@ -287,7 +287,7 @@ void SwModify::Add(SwClient *pDepend)
     // nur wenn das hier noch nicht eingetragen ist einfuegen
     if(pDepend->pRegisteredIn != this )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         SwClientIter* pTmp = pClientIters;
         while( pTmp )
         {
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 6fce2c4a59f5..d77e5bb9c4ff 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -147,7 +147,7 @@ SwAttrSetChg::~SwAttrSetChg()
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwAttrSetChg::ClearItem( USHORT nWhch )
 {
@@ -183,7 +183,7 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
  * Ist keines vorhanden, returnt ein 0-Pointer !!!
  * Used to be inlined (hintids.hxx) in PRODUCT.
  ******************************************************************************/
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 const SfxPoolItem* GetDfltAttr( USHORT nWhich )
 {
     return aAttrTab[ nWhich - POOLATTR_BEGIN ];
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 4f9d3c3b77cc..3597f4a5f376 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -387,7 +387,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             // <--
         }
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
 #endif
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index fd91c3529f52..9158dffe96dd 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -41,7 +41,7 @@
 // immer ~ 20 * MAXENTRY == 20000 Eintraege
 const USHORT nBlockGrowSize = 20;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 
 #define CHECKIDX( p, n, i, c )
 
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index d8b6ccadc65d..56c02a51c330 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -39,7 +39,7 @@
 #include "index.hxx"
 #include "error.h"              // fuers ASSERT
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 int SwIndex::nSerial = 0;
 #endif
 
@@ -103,7 +103,7 @@ SwIndex::SwIndex( SwIndexReg* pArr, xub_StrLen nIdx )
     else
         ChgValue( *pArray->pFirst, nIdx );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -115,7 +115,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
 {
     ChgValue( rIdx, rIdx.nIndex + nIdx );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -126,7 +126,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
     : nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 )
 {
     ChgValue( rIdx, rIdx.nIndex );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -371,7 +371,7 @@ void SwIndexReg::Update( const SwIndex& rIdx, xub_StrLen nDiff, BOOL bNeg,
 ARR_CHK_ARRAY
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef CFRONT
 
 /*************************************************************************
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 9563a51324bb..647a82eaf5bc 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -785,7 +785,7 @@ void _FinitCore()
 
     delete SwEditShell::pAutoFmtFlags;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Defaultattribut freigeben lassen um asserts zu vermeiden.
     if ( aAttrTab[0]->GetRefCount() )
         SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, FALSE);
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 0e9ed9fd3720..ea2513d6237e 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -38,7 +38,7 @@
 
 SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define INCREMENT( nVar )
 #else
 #define INCREMENT( nVar )   ++nVar
@@ -53,7 +53,7 @@ SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 |*
 |*************************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwCache::Check()
 {
@@ -90,7 +90,7 @@ void SwCache::Check()
 }
 #endif
 
-#if !defined(PRODUCT) && defined(MADEBUG)
+#if defined(DBG_UTIL) && defined(MADEBUG)
 #define CHECK Check();
 #else
 #define CHECK
@@ -107,7 +107,7 @@ void SwCache::Check()
 
 
 SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , const ByteString &rNm
 #endif
     ) :
@@ -118,7 +118,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
     pLast( 0 ),
     nMax( nInitSize ),
     nCurMax( nInitSize )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , aName( rNm ),
     nAppend( 0 ),
     nInsertFree( 0 ),
@@ -137,7 +137,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
 {
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 
 SwCache::~SwCache()
@@ -197,7 +197,7 @@ void SwCache::Flush( const BYTE )
     SwCacheObj *pTmp;
     while ( pObj )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( pObj->IsLocked() )
         {
             ASSERT( TRUE, "Flushing locked objects." );
@@ -322,7 +322,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const USHORT nIndex,
             ToTop( pRet );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( pRet )
             ++nGetSuccess;
         else
@@ -346,7 +346,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
     if ( bToTop && pRet && pRet != pFirst )
         ToTop( pRet );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( pRet )
         ++nGetSuccess;
     else
@@ -588,7 +588,7 @@ SwCacheObj::~SwCacheObj()
 |*
 |*************************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 
 
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 21fd4c7a2970..15911eb45053 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
@@ -310,7 +310,7 @@ void SwRect::SetUpperRightCorner(  const Point& rNew )
 void SwRect::SetLowerLeftCorner(  const Point& rNew )
     { nX = rNew.nA; nY = rNew.nB - nHeight; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*************************************************************************
  *                  operator<<( ostream&, SwRect&)
  *************************************************************************/
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8b54e9647be3..3b291f059784 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -335,7 +335,7 @@ if( GetWin() )
 }
 
 
-#if !defined( PRODUCT )
+#if defined(DBG_UTIL)
 
 void SwCrsrShell::SttCrsrMove()
 {
@@ -1461,7 +1461,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
                 Point aCentrPt( aCharRect.Center() );
                 aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
                 pTblFrm->GetCrsrOfst( pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                 pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
 #else
                 if ( !pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() ) )
@@ -2014,7 +2014,7 @@ void SwCrsrShell::Combine()
     SwCrsrSaveState aSaveState( *pCurCrsr );
     if( pCrsrStk->HasMark() )           // nur wenn GetMark gesetzt wurde
     {
-#ifdef PRODUCT
+#ifndef DBG_UTIL
         CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE );
 #else
         if( !CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE ))
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 87a579150e76..327e8e67af08 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1337,7 +1337,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
 
             if( !bRet && (
                 SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
 #endif
                 ))
@@ -1349,7 +1349,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
                     0 != ( pBox = pTblNd->GetTable().GetTblBox(
                                     pSttNd->GetIndex() )) &&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
                         RES_BOXATR_FORMULA, FALSE, &pItem ) ||
                       SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
@@ -1383,7 +1383,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                         // erzeuge aus der internen (fuer CORE)
                         // die externe (fuer UI) Formel
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         if( RES_BOXATR_VALUE == pItem->Which() )
                             rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
                         else
@@ -1417,7 +1417,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 }
             }
 
-#ifndef PRODUCT
+#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 860117babcc0..8563610af3d2 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -494,7 +494,7 @@ void SwPaM::SetMark()
     (*pMark) = (*pPoint);
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwPaM::Exchange()
 {
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 2599d785d9c2..1a30931f290f 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -308,7 +308,7 @@ BOOL SwCrsrShell::SelTblBox()
     const SwStartNode* pStartNode =
         pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // the old code checks whether we're in a table by asking the
     // frame. This should yield the same result as searching for the
     // table box start node, right?
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index c1e095f38dd9..a7fc7ea3665b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -1040,7 +1040,7 @@ BOOL SwShellCrsr::UpDown( BOOL bUp, USHORT nCnt )
                             &GetPtPos(), GetShell()->GetUpDownX() );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
@@ -1182,7 +1182,7 @@ BOOL SwShellTableCrsr::IsInside( const Point& rPt ) const
     return FALSE;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index aee5a3cd5550..530dc1e90e0b 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -546,7 +546,7 @@ String lcl_dbg_out(const SwNode & rNode)
     aTmpStr += String::CreateFromInt32(rNode.GetIndex());
     aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US);
 
-#ifndef PRODUCT
+#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/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 95e18a7e78af..364c664d0bea 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -258,7 +258,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 
             // --> OD 2005-08-16 #i53320#
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SwAnchoredDrawObject* pAnchoredDrawObj =
                 static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
             ASSERT( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 39320b14fc02..26971a4b86ee 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -601,7 +601,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFld->CalcField( aPara );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         else
                         {
                             // mind. ein ASSERT
@@ -669,7 +669,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFml->Calc( aPara, nValue );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                         else
                         {
                             // mind. ein ASSERT
@@ -907,7 +907,7 @@ void _SetGetExpFld::SetBodyPos( const SwCntntFrm& rFrm )
         SwNodeIndex aIdx( *rFrm.GetNode() );
         SwDoc& rDoc = *aIdx.GetNodes().GetDoc();
         SwPosition aPos( aIdx );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( ::GetBodyTxtNode( rDoc, aPos, rFrm ), "wo steht das Feld" );
 #else
         ::GetBodyTxtNode( rDoc, aPos, rFrm );
@@ -2551,7 +2551,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
     {
         // einen Index fuers bestimmen vom TextNode anlegen
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
         GetBodyTxtNode( rDoc, aPos, *pFrm );
@@ -2599,7 +2599,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
             if( !pFrm )
                 break;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
             GetBodyTxtNode( rDoc, aPos, *pFrm );
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index ace606ae86ac..2be5dc7cbca0 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -271,7 +271,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, BOOL bNewFrms
         ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr * pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
         ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
@@ -618,7 +618,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             // Continue with next selected object and assert, if this isn't excepted.
             if ( !pContact )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 bool bNoUserCallExcepted =
                         pObj->ISA(SwDrawVirtObj) &&
                         !static_cast<SwDrawVirtObj*>(pObj)->IsConnected();
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 29258f9de72e..ae4945b8137c 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -212,7 +212,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
         }
         break;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     case FLY_PAGE:
     case FLY_AUTO_CNTNT:
     case FLY_AT_FLY:
@@ -1381,7 +1381,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
                     const xub_StrLen nIdx = pPos->nContent.GetIndex();
                     SwTxtAttr *pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                                 "Missing FlyInCnt-Hint." );
                     ASSERT( pHnt && ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).
@@ -1674,7 +1674,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr *pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
         ASSERT( pHnt && ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index a0348d84b352..5491e761ca3f 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -324,7 +324,7 @@ SwDoc::SwDoc() :
     mbInsOnlyTxtGlssry =
     mbContains_MSVBasic =
     mbKernAsianPunctuation =
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     mbXMLExport =
 #endif
     // --> OD 2006-03-21 #b6375613#
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index e23f56bab386..5f03da022d63 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star;
 
 TYPEINIT1(SwRedlineHint, SfxHint);
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 
     #define _CHECK_REDLINE( pDoc )
     #define _DEBUG_REDLINE( pDoc )
@@ -309,7 +309,7 @@ Verhalten von Delete-Redline:
 
 bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SwRedline aCopy( *pNewRedl );
 #endif
     _CHECK_REDLINE( this )
@@ -3675,7 +3675,7 @@ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx )
         delete pCntntSect, pCntntSect = 0;
         bIsVisible = FALSE;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( !this, "das ist keine gueltige Operation" );
 #endif
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index e4b7b9e87a88..e3effed7250c 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -397,7 +397,7 @@ USHORT SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc )
 */
             ASSERT( nWidth, "No browse width available" );
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         else
         {
             // und wenn das auch nicht klappt, gibt es zur Zeit keine Breite
@@ -1660,13 +1660,13 @@ static BOOL lcl_ResizeBox( const SwTableBox*& rpBox, void* pPara )
 static BOOL lcl_ResizeLine( const SwTableLine*& rpLine, void* pPara )
 {
     USHORT *pWidth = (USHORT *)pPara;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nOldWidth = *pWidth;
 #endif
     *pWidth = 0;
     ((SwTableLine *)rpLine)->GetTabBoxes().ForEach( &lcl_ResizeBox, pWidth );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY,
             "Zeilen einer Box sind unterschiedlich lang" );
 #endif
@@ -1777,7 +1777,7 @@ void SwHTMLTableLayout::SetWidths( BOOL bCallPass2, USHORT nAbsAvail,
             }
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         {
             // steht im tblrwcl.cxx
             extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 94925f5ffc5e..46766dd31694 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -478,7 +478,7 @@ const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 long int SwNumRule::nInstances = 0;
 #endif
 
@@ -512,7 +512,7 @@ SwNumRule::SwNumRule( const String& rNm,
     msDefaultListId()
     // <--
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSerial = nInstances++;
 #endif
 
@@ -632,7 +632,7 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       msDefaultListId( rNumRule.msDefaultListId )
       // <--
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSerial = nInstances++;
 #endif
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 7712bd125720..d8da6b6b7612 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;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -197,7 +197,7 @@ BOOL lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
 
 typedef BOOL (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, BOOL );
 
-#if !defined( PRODUCT ) || defined( JP_DEBUG )
+#if defined(DBG_UTIL) || defined( JP_DEBUG )
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 
@@ -3499,7 +3499,7 @@ void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
     }
 }
 
-#if !defined( PRODUCT ) || defined( JP_DEBUG )
+#if defined(DBG_UTIL) || defined( JP_DEBUG )
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 {
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 3f8280070d37..08ecae818858 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -59,7 +59,7 @@
 #include <pagedesc.hxx>
 #include <poolfmt.hxx>
 #include <SwNodeNum.hxx>
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -1195,7 +1195,7 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
 
     aRedlRest.Restore();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         //JP 17.06.99: Bug 66973 - check count only if the selection is in
         //              the same (or no) section. Becaus not full selected
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index 54936230228d..d4611aad60d7 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -37,7 +37,7 @@
 #include "error.h"              // fuers ASSERT
 #include "ndindex.hxx"
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 int SwNodeIndex::nSerial = 0;
 #endif
 
@@ -71,7 +71,7 @@ SwNodeIndex::SwNodeIndex( SwNodes& rNds, ULONG nIdx )
 {
     rNds.RegisterIndex( *this );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -86,7 +86,7 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
         pNd = rIdx.pNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -101,7 +101,7 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
         pNd = (SwNode*)&rNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index ae70599de061..aaf4814b3577 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -50,7 +50,7 @@ BOOL SwOutlineNodes::Seek_Entry( const SwNodePtr rSrch, USHORT* pFndPos ) const
 //JP 17.03.98: aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
 //              Nodes aus dem falschen NodesArray im OutlineArray standen,
 //              jetzt mal einen Check eingebaut.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         {
             for( USHORT n = 1; n < nO; ++n )
                 if( &(*this)[ n-1 ]->GetNodes() !=
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 1e1bcd55022a..f028862b4c05 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -108,7 +108,7 @@
 // --> OD 2005-12-05 #i27138#
 #include <rootfrm.hxx>
 // <--
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index acd1ceabce9b..599dcdc9463e 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -341,7 +341,7 @@ USHORT SwNode::GetSectionLevel() const
 |*
 *******************************************************************/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 long SwNode::nSerial = 0;
 #endif
 
@@ -373,7 +373,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nMySerial = nSerial;
     nSerial++;
 #endif
@@ -406,7 +406,7 @@ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nMySerial = nSerial;
     nSerial++;
 #endif
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index ef39f7ced4a4..2b50fe6d627e 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -397,7 +397,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
             if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() )
                 pFrmNd = 0;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( !pFrmNd )
                 ASSERT( !this, "ChgNode() - kein FrameNode gefunden" );
 #endif
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 0a866b3855fb..4c6c66d5fec0 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -274,7 +274,7 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
             if( pGrf->IsSwapOut() ||
                 ( pGrfNode->IsLinkedFile() && GRAPHIC_DEFAULT == pGrf->GetType() ) )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
@@ -285,7 +285,7 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
         {
             if ( pGrf->IsSwapOut() && !pGrfNode->IsLinkedFile() )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
@@ -717,7 +717,7 @@ Graphic SwEditShell::GetIMapGraphic() const
             if( rGrf.IsSwapOut() || ( ((SwGrfNode*)pNd)->IsLinkedFile() &&
                                     GRAPHIC_DEFAULT == rGrf.GetType() ) )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( ((SwGrfNode*)pNd)->SwapIn( TRUE ) || !TRUE, "Grafik konnte nicht geladen werden" );
 #else
                 ((SwGrfNode*)pNd)->SwapIn( TRUE );
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index b25804eadfc4..d97b6c2864e6 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -585,7 +585,7 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
             }
         }
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         ASSERT(!this, "Cursor not on an outline node" );
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index 2f551d4f7826..a492831df2bf 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles rum?
 #endif
 #include <tools/stream.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index cdb73706b3c2..6bfa5c1cf760 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2318,7 +2318,7 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
                 {
                     // einen sdbcx::Index fuers bestimmen vom TextNode anlegen
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( GetBodyTxtNode( *pDoc, aPos, *pFrm ),
                             "wo steht das Feld" );
 #else
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3de792b4f0ac..c1c445a4b6eb 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -167,7 +167,7 @@ SwFieldType::SwFieldType( USHORT nWhichId )
     DBG_CTOR( SwFieldType, 0 );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 SwFieldType::~SwFieldType()
 {
@@ -213,7 +213,7 @@ SwField::~SwField()
     Beschreibung: Statt Umweg ueber den Typ
  --------------------------------------------------------------------*/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 USHORT SwField::Which() const
 {
     ASSERT(pType, "Kein Typ vorhanden");
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index d7ee250cf216..9c5865851dc6 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -70,7 +70,7 @@ USHORT SwFEShell::GetPageDescCnt() const
 
 void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Die SS veraendert keinen PageDesc, sondern setzt nur das Attribut.
     //Der Pagedesc muss im Dokument vorhanden sein!
     BOOL bFound = FALSE;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 3b82b28c6090..56c1790fa4b2 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -218,7 +218,7 @@ sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet )
 
     SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !(nNew == FLY_PAGE &&
         (FLY_AT_CNTNT==nOld || FLY_AUTO_CNTNT==nOld || FLY_IN_CNTNT==nOld ) &&
         pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
@@ -602,7 +602,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
             SwRect aTmpRect( aRet, rAbsPos );
             if( aTmpRect.HasArea() )
                 MakeVisible( aTmpRect );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             //TODO: That doesn't seem to be intended
             if( Color(COL_TRANSPARENT) != GetOut()->GetLineColor() )
             {
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index aa9d17b2ef1d..3cc41ef12a4c 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -66,7 +66,7 @@
 #define SNAP_FLYFRAMES   0x00000002
 #define SNAP_TABLECONT   0x00000004
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 #include "swtypes.hxx"
 
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
index b45014d088e5..a655bbf26194 100644
--- a/sw/source/core/inc/dbgloop.hxx
+++ b/sw/source/core/inc/dbgloop.hxx
@@ -31,7 +31,7 @@
 #ifndef _DBGLOOP_HXX
 #define _DBGLOOP_HXX
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 0c624b41f939..63b829c8fb85 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -97,7 +97,7 @@ class SwDrawTextInfo
     SwDrawTextInfo();       // nicht zulaessig
 public:
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bPos   : 1;            // These flags should control, that the appropriate
     BOOL bWrong : 1;            // Set-function has been called before calling
     BOOL bGrammarCheck : 1;     //  the Get-function of a member
@@ -160,7 +160,7 @@ public:
         bUpper = FALSE;
         bDrawSpace = FALSE;
 
-#ifndef PRODUCT
+#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:
@@ -383,7 +383,7 @@ public:
     void SetPos( const Point &rNew )
     {
         pPos = &rNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bPos = TRUE;
 #endif
     }
@@ -391,7 +391,7 @@ public:
     void SetHyphPos( xub_StrLen *pNew )
     {
         pHyphPos = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bHyph = TRUE;
 #endif
     }
@@ -404,7 +404,7 @@ public:
     void SetWrong( const SwWrongList* pNew )
     {
         pWrong = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bWrong = TRUE;
 #endif
     }
@@ -412,7 +412,7 @@ public:
     void SetGrammarCheck( const SwWrongList* pNew )
     {
         pGrammarCheck = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bGrammarCheck = TRUE;
 #endif
     }
@@ -425,7 +425,7 @@ public:
     void SetSize( const Size &rNew )
     {
         pSize = &rNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bSize = TRUE;
 #endif
     }
@@ -433,7 +433,7 @@ public:
     void SetFont( SwFont* pNew )
     {
         pFnt = pNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bFnt = TRUE;
 #endif
     }
@@ -451,7 +451,7 @@ public:
     void SetOfst( xub_StrLen nNew )
     {
         nOfst = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bOfst = TRUE;
 #endif
     }
@@ -459,7 +459,7 @@ public:
     void SetLeft( long nNew )
     {
         nLeft = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bLeft = TRUE;
 #endif
     }
@@ -467,7 +467,7 @@ public:
     void SetRight( long nNew )
     {
         nRight = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bRight = TRUE;
 #endif
     }
@@ -475,7 +475,7 @@ public:
     void SetKanaDiff( long nNew )
     {
         nKanaDiff = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bKana = TRUE;
 #endif
     }
@@ -488,7 +488,7 @@ public:
     void SetAscent( USHORT nNew )
     {
         nAscent = nNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bAscent = TRUE;
 #endif
     }
@@ -510,7 +510,7 @@ public:
             nSpace = nNew;
             nSperren = 0;
         }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bSpace = TRUE;
         bSperr = TRUE;
 #endif
@@ -518,7 +518,7 @@ public:
 
     void SetNumberOfBlanks( xub_StrLen nNew )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bNumberOfBlanks = TRUE;
 #endif
         nNumberOfBlanks = nNew;
@@ -547,7 +547,7 @@ public:
     void SetUpper( BOOL bNew )
     {
         bUpper = bNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bUppr = TRUE;
 #endif
     }
@@ -555,7 +555,7 @@ public:
     void SetDrawSpace( BOOL bNew )
     {
         bDrawSpace = bNew;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bDrawSp = TRUE;
 #endif
     }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index dc8975f3fd47..4e3c196814c6 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -168,7 +168,7 @@ public:
 
     virtual void  CheckDirection( BOOL bVert );
     virtual void Cut();
-#ifndef PRODUCT
+#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 5b1dff0a52cb..de68dc28f6c5 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -54,7 +54,7 @@ class SwFntCache : public SwCache
 public:
 
     inline SwFntCache() : SwCache(50,50
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , ByteString( RTL_CONSTASCII_STRINGPARAM(
                         "Globaler Font-Cache pFntCache" ))
 #endif
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index ee8d2a56d0d1..d135786ee683 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -74,7 +74,7 @@ class SwFtnFrm: public SwLayoutFrm
     // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
     // <--
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 protected:
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
@@ -89,7 +89,7 @@ public:
 
     BOOL operator<( const SwTxtFtn* pTxtFtn ) const;
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     const SwCntntFrm *GetRef() const    { return pRef; }
          SwCntntFrm  *GetRef()          { return pRef; }
 #else
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 49edc1d28d53..ad4c7730d07c 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -218,13 +218,13 @@ class SwLayIdle
     BOOL        bPageValid;     // Konnte die Seite alles validiert werden?
     BOOL        bAllValid;      // Konnte alles validiert werden?
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bIndicator;
 #endif
 
 #ifdef _LAYACT_CXX
 
-#ifndef PRODUCT
+#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 339b0cd5bdfc..336d68083566 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -72,7 +72,7 @@ public:
           return pImpl; }
     void UnlockImpl() { --nLockCount; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool CompareLayout( const SwDoc& rDoc ) const;
 #endif
 };
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index c04b30792b53..be5b8acd22da 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -203,7 +203,7 @@ public:
     virtual void  Paint( const SwRect& ) const;
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
@@ -313,7 +313,7 @@ public:
     void InsertEmptySct( SwSectionFrm* pDel );
     void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); }
     void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wird zur Zeit nur fuer ASSERTs benutzt:
     BOOL IsInDelList( SwSectionFrm* pSct ) const; // Ist der SectionFrm in der Liste enthalten?
 #endif
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index c2348483a49a..4682bbde2357 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -60,7 +60,7 @@
  *
  */
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
@@ -94,7 +94,7 @@ class SwCache : public SwCacheObjArr
 
     void DeleteObj( SwCacheObj *pObj );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ByteString aName;
     long nAppend;           //Anzahl der Eintragungen durch Erweiterung.
     long nInsertFree;       //Anzahl der Eintragungen auf freie Plaetze.
@@ -116,7 +116,7 @@ class SwCache : public SwCacheObjArr
 public:
 
     //nur BYTE hineinstecken!!!
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SwCache( const USHORT nInitSize, const USHORT nGrowSize,
             const ByteString &rNm );
     ~SwCache();
@@ -197,7 +197,7 @@ public:
 
     inline BOOL IsLocked() const { return 0 != nLock; }
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     inline void Lock() { ++nLock; }
     inline void Unlock() { --nLock; }
 #else
@@ -249,7 +249,7 @@ public:
 inline void SwCache::IncreaseMax( const USHORT nAdd )
 {
     nCurMax = nCurMax + sal::static_int_cast< USHORT >(nAdd);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ++nIncreaseMax;
 #endif
 }
@@ -257,7 +257,7 @@ inline void SwCache::DecreaseMax( const USHORT nSub )
 {
     if ( nCurMax > nSub )
         nCurMax = nCurMax - sal::static_int_cast< USHORT >(nSub);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ++nDecreaseMax;
 #endif
 }
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index bad28cd2a6a0..1b1fd47db7b3 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -49,7 +49,7 @@ class SwFontCache : public SwCache
 public:
 
     inline SwFontCache() : SwCache(50,50
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "Globaler AttributSet/Font-Cache pSwFontCache"
 #endif
     ) {}
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index c36d5d9d4192..e09433afac48 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -844,7 +844,7 @@ public:
  *                      class SvStatistics
  *************************************************************************/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define SV_STAT(nWhich)
 #else
 
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index b9a614455edf..9b703d801040 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -69,7 +69,7 @@ BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara );
 BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara );
 
 
-#ifndef PRODUCT
+#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 b0b2b807ab43..79cd2a1a574c 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -405,7 +405,7 @@ public:
     inline sal_Bool IsSwapped() const { return bIsSwapped; }
 
     // Hat der Frm eine lokale Fussnote (in diesem Frm bzw. Follow)?
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     void CalcFtnFlag();
 #else
     void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//Fuer den Test von SplitFrm
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 9279a169b0a5..de2bbdf6ef43 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -691,7 +691,7 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 //mich also bei meinem Format aus.
                 //Dabei werden ich Deletet!!!
             if( IS_TYPE( SwFmt, pDefinedIn ))
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             {
                 sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
                 ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
@@ -700,7 +700,7 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
 #endif
             else if( IS_TYPE( SwCntntNode, pDefinedIn ))
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             {
                 sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
                 ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b24ee7fd78b1..9648eb12dabf 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -851,7 +851,7 @@ void SwPageFrm::MakeAll()
     if ( Frm() != aOldRect && GetUpper() )
         static_cast<SwRootFrm*>(GetUpper())->CheckViewLayout( 0, 0 );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Der Upper (Root) muss mindestens so breit
     //sein, dass er die breiteste Seite aufnehmen kann.
     if ( GetUpper() )
@@ -1139,7 +1139,7 @@ void SwCntntFrm::MakeAll()
     // <--
     PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     const SwDoc *pDoc = GetAttrSet()->GetDoc();
     if( pDoc )
     {
@@ -1695,7 +1695,7 @@ void SwCntntFrm::MakeAll()
                       ( !bSct || !FindSctFrm()->IsColLocked() ) )
                     bMoveOrFit = TRUE;
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 ASSERT( FALSE, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." );
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 5eeaef485d29..0834b18c8c15 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -106,7 +106,7 @@
  *
  * --------------------------------------------------*/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles rum?
 #endif
 
@@ -139,7 +139,7 @@ SwImplProtocol* SwProtocol::pImpl = NULL;
 
 ULONG lcl_GetFrameId( const SwFrm* pFrm )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static BOOL bFrameId = FALSE;
     if( bFrameId )
         return pFrm->GetFrmId();
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 252ea3298531..aff881499c3b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -277,7 +277,7 @@ void SwFlyFreeFrm::MakeAll()
     }
     Unlock();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SWRECTFN( this )
     ASSERT( bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
             (Prt().*fnRect->fnGetHeight)() > 0),
@@ -966,7 +966,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
     }
     if ( !pSortedObjs->Insert( _rNewObj ) )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pSortedObjs->Contains( _rNewObj ),
                 "Drawing object not appended into list <pSortedObjs>." );
 #endif
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 0c1821aed60c..7a48f0661eb2 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1690,7 +1690,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         delete pPageMaker;
         if( pDoc->GetLayoutCache() )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
             pDoc->GetLayoutCache()->CompareLayout( *pDoc );
 #endif
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index b9663b1418d6..69b468bf3d68 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -356,7 +356,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
     //moeglich.
     //Wenn die Seite eine spezielle Fussnotenseite ist, so nehmen wir uns auch
     //soviel Platz wie eben moeglich.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( !GetUpper() || !GetUpper()->IsFtnBossFrm() )
     {   ASSERT( !this, "Keine FtnBoss." );
         return 0;
@@ -562,7 +562,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
@@ -711,7 +711,7 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
         pDel->Cut();
         delete pDel;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SwDoc *pDoc = GetFmt()->GetDoc();
     if ( GetPrev() )
     {
@@ -1142,7 +1142,7 @@ SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
     //immer direkt hinter dem Bodytext.
     //Sein FrmFmt ist immer das DefaultFrmFmt.
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( FindFtnCont() )
     {   ASSERT( !this, "Fussnotencontainer bereits vorhanden." );
         return 0;
@@ -1171,7 +1171,7 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
     while( pFrm && !pFrm->IsFtnContFrm() )
         pFrm = pFrm->GetNext();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( pFrm )
     {
         SwFrm *pFtn = pFrm->GetLower();
@@ -1416,7 +1416,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
 
 void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
 {
-#if (OSL_DEBUG_LEVEL > 1) && !defined(PRODUCT)
+#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
     static USHORT nStop = 0;
     if ( nStop == pNew->GetFrmId() )
     {
@@ -3278,7 +3278,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
 }
 
 
-#ifndef PRODUCT
+#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 9cbf7ace6ea7..433167d7a47a 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -116,7 +116,7 @@
 
 
 //Sparen von Schreibarbeit um den Zugriff auf zerstoerte Seiten zu vermeiden.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 static void BreakPoint()
 {
@@ -2808,7 +2808,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
@@ -2857,7 +2857,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData )
 SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     pRoot( pRt ),
     pImp( pI )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
     , bIndicator( FALSE )
 #endif
@@ -3040,7 +3040,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     if( pImp->IsAccessible() )
         pImp->FireAccessibleEvents();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
     if ( bIndicator && pImp->GetShell()->GetWin() )
     {
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 70738152e1bd..22b8f5628c21 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -348,7 +348,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
 {
     sal_Bool bRet = sal_True;
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 1afbe6632d4b..f9a75f01f008 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -201,7 +201,7 @@ void SwLooping::Control( SwPageFrm* pPage )
     }
     else if( ++nCount > LOOP_DETECT )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #if OSL_DEBUG_LEVEL > 1
         static BOOL bNoLouie = FALSE;
         if( bNoLouie )
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 82a1ad0690ac..a3e94a8e0f15 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -311,7 +311,7 @@ void _FrmInit()
 {
     SwRootFrm::pVout = new SwLayVout();
     SwCache *pNew = new SwCache( 100, 100
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "static SwBorderAttrs::pCache"
 #endif
     );
@@ -322,7 +322,7 @@ void _FrmInit()
 
 void _FrmFinit()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // im Chache duerfen nur noch 0-Pointer stehen
     for( USHORT n = SwFrm::GetCachePtr()->Count(); n; )
         if( (*SwFrm::GetCachePtr())[ --n ] )
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 79d267c1f934..798ec6a05f89 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1196,7 +1196,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
                 if ( pPage->GetFmt() != pFmtWish )
                     pPage->SetFrmFmt( pFmtWish );
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 ASSERT( FALSE, "CheckPageDescs, missing solution" );
@@ -1239,7 +1239,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
         pDoc->UpdatePageFlds( &aMsgHnt );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     //Ein paar Pruefungen muessen schon erlaubt sein.
 
     //1. Keine zwei EmptyPages hintereinander.
@@ -1670,7 +1670,7 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
                     {
                         //Umhaengen kann er sich selbst, indem wir ihm
                         //einfach ein Modify mit seinem AnkerAttr schicken.
-#ifdef PRODUCT
+#ifndef DBG_UTIL
                         rFmt.SwModify::Modify( 0, (SwFmtAnchor*)&rAnch );
 #else
                         const sal_uInt32 nCnt = pPage->GetSortedObjs()->Count();
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index dececa60560e..7e19c5e2f458 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1363,7 +1363,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             continue;
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         //Flys, die innerhalb des eigenen verankert sind, muessen eine
         //groessere OrdNum haben oder Zeichengebunden sein.
         if ( pSelfFly && bLowerOfSelf )
@@ -2049,7 +2049,7 @@ void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut )
 
     io_aSwRect = SwRect( aSizedRect );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     Rectangle aTestOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() );
     Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
     ASSERT( aTestOrgPxRect == aTestNewPxRect,
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index e6275cb5481a..8af09ae42d4d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2777,7 +2777,7 @@ void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct )
         pDestroy->Remove( nPos );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 BOOL SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const
 {
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 1efe4c723e7b..4d854cd80273 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -411,7 +411,7 @@ SwFrm::~SwFrm()
             delete pDrawObjs;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // JP 15.10.2001: for detection of access to deleted frames
     pDrawObjs = (SwSortedObjs*)0x33333333;
 #endif
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index be31859c036d..a983911edb63 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3642,7 +3642,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
             // Spalten abklappern, dies erledigt SwSectionFrm::FindLastCntnt
             if( pRet->IsColBodyFrm() )
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwSectionFrm* pSect = pRet->FindSctFrm();
                 ASSERT( pSect, "Wo kommt denn die Spalte her?")
                 ASSERT( IsAnLower( pSect ), "Gespaltene Zelle?" );
@@ -4609,7 +4609,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
     {
         bValidSize = TRUE;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( HasFixSize() )
         {
             const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize();
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 2074adea4df3..40af29efd18d 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1286,7 +1286,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
             break;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( pActual, "Keinen Cntnt gefunden." );
     if ( bBodyOnly )
         ASSERT( pActual->IsInDocBody(), "Cnt nicht im Body." );
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index e7d602ae5aba..994a4d9ce625 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -67,7 +67,7 @@ BOOL SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState*  ) const
     return FALSE;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwRootFrm::Cut()
 {
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index b27b505acf8f..a8b6b2aedad1 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -42,7 +42,7 @@
 // OD 12.11.2002 #96272# - include declaration for <SetMappingForVirtDev>
 #include "setmapvirtdev.hxx"
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                          class DbgRect
@@ -186,7 +186,7 @@ void SwLayVout::Enter(  ViewShell *pShell, SwRect &rRect, BOOL bOn )
 {
     Flush();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( pShell->GetViewOptions()->IsTest3() )
         {
             ++nCount;
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index af97063da6e3..8268693bdb9d 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -102,7 +102,7 @@ SwFrm::SwFrm( SwModify *pMod ) :
     pPrev( 0 ),
     pDrawObjs( 0 )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
 #endif
 
@@ -3866,7 +3866,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                 if( pLastSctCnt == pCnt )
                     pLastSctCnt = NULL;
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( !pLastSctCnt, "Where's the last SctCntnt?" );
 #endif
@@ -3894,7 +3894,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                     pLastSctCnt = NULL;
                 }
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( !pLastTabCnt, "Where's the last TabCntnt?" );
 #endif
diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk
index d9ea1102e375..ca4ebb296b9b 100644
--- a/sw/source/core/makefile.mk
+++ b/sw/source/core/makefile.mk
@@ -73,7 +73,7 @@ SUBLIBS3= \
                 $(SLB)$/SwNumberTree.lib \
                 $(SLB)$/tablecore.lib
 
-.IF "$(PRODUCT)" == ""
+.IF "$(DBG_LEVEL)" != "0"
 SUBLIBS3+= \
         $(SLB)$/except.lib
 .ENDIF
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index e1c10ab74a09..bdaa12d9bc3f 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -50,7 +50,7 @@
 #include <svx/protitem.hxx>
 #include <swtblfmt.hxx>
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -779,7 +779,7 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     aFndBox.MakeFrms( *this );
 //  aFndBox.RestoreChartData( *this );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         const SwTableBoxes &rTabBoxes = aLines[0]->GetTabBoxes();
         long nNewWidth = 0;
@@ -2144,7 +2144,7 @@ void SwTable::CleanUpBottomRowSpan( USHORT nDelLines )
     }
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 struct RowSpanCheck
 {
@@ -2178,7 +2178,7 @@ void SwTable::CheckConsistency() const
             if( nRowSp < 0 )
             {
                 ASSERT( aIter != aRowSpanCells.end(), "Missing master box" )
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 //RowSpanCheck &rCheck = *aIter;
 #endif
                 ASSERT( aIter->nLeft == nWidth && aIter->nRight == nNewWidth,
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 715fa0eed2a6..632fe118be87 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -74,7 +74,7 @@
 #include <redline.hxx>
 #include <list>
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -1090,7 +1090,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
 // steht im tblrwcl.cxx
 extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
@@ -1197,7 +1197,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
         USHORT nPos = (USHORT)nSum;
         while( pCurr != rChanges.end() && pCurr->first < nPos )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             USHORT nTemp = pCurr->first;
             nTemp = pCurr->second;
 #endif
@@ -1297,7 +1297,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
 void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
     const SwTabCols &rOld, const SwTableBox *pStart, BOOL bCurRowOnly )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     static int nCallCount = 0;
     ++nCallCount;
 #endif
@@ -2013,7 +2013,7 @@ BOOL SwTableBox::IsInHeadline( const SwTable* pTbl ) const
     return pTbl->GetTabLines()[ 0 ] == pLine;
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 ULONG SwTableBox::GetSttIdx() const
 {
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 614678d34978..3fd60b03efeb 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -106,7 +106,7 @@ FrmTagIdMap SwEnhancedPDFExportHelper::aFrmTagIdMap;
 
 LanguageType SwEnhancedPDFExportHelper::eLanguageDefault = 0;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 static std::vector< USHORT > aStructStack;
 
@@ -295,7 +295,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
 
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -308,7 +308,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
         else
             BeginTag( vcl::PDFWriter::NonStructElement, aEmptyString );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -323,13 +323,13 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
 {
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
         EndStructureElements();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -398,7 +398,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
         const bool bSuccess = mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
         ASSERT( bSuccess, "Failed to reopen tag" )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStructStack.push_back( 99 );
 #endif
 
@@ -421,7 +421,7 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
         (void)bSuccess;
         ASSERT( bSuccess, "Failed to restore reopened tag" )
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStructStack.pop_back();
 #endif
 
@@ -441,7 +441,7 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const Str
     const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) );
     ++nEndStructureElement;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.push_back( static_cast<USHORT>(eType) );
 #endif
 
@@ -501,7 +501,7 @@ void SwTaggedPDFHelper::EndTag()
 {
     mpPDFExtOutDevData->EndStructureElement();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.pop_back();
 #endif
 }
@@ -977,7 +977,7 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
             nRestoreCurrentTag = mpPDFExtOutDevData->GetCurrentStructureElement();
             mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             aStructStack.push_back( 99 );
 #endif
         }
@@ -1529,7 +1529,7 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
     aNumListBodyIdMap.clear();
     aFrmTagIdMap.clear();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aStructStack.clear();
 #endif
 
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 8e5bf1bfc25c..5fc45ef66953 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -887,7 +887,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                 aCharBox.Pos().X() = aCharBox.Pos().X() - 150;
 
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
                 // Der Node soll nicht gewechselt werden
@@ -1253,7 +1253,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             if( pNextLine || bFirstOfDouble )
             {
                 aCharBox.SSize().Width() /= 2;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 8a39847705e2..676171a343b2 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -248,7 +248,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
         ( pMyFollow->IsVertical() && !pMyFollow->Prt().Width() ) ||
         ( ! pMyFollow->IsVertical() && !pMyFollow->Prt().Height() ) )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwFrm *pOldUp = GetUpper();
 #endif
 
@@ -377,7 +377,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
                 pPage->ValidateCntnt();
         }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pOldUp == GetUpper(), "SwTxtFrm::CalcFollow: heavy follow" );
 #endif
 
@@ -667,7 +667,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else if ( pFoll->GetValidPrtAreaFlag() ||
               pFoll->GetValidSizeFlag() )
     {
@@ -767,7 +767,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         CalcFtnFlag( nTxtPos-1 );
@@ -1843,7 +1843,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
     const SwFrm *pDbgFtnCont = (const SwFrm*)(FindPageFrm()->FindFtnCont());
     (void)pDbgFtnCont;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -2089,7 +2089,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
     const XubString aXXX = GetTxtNode()->GetTxt();
     const SwTwips nDbgY = Frm().Top();
     (void)nDbgY;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -2135,7 +2135,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
         //DBG_LOOP; shadows declaration above.
         //resolved into:
 #if OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 5a88599c6e35..05c142e1fd84 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -728,7 +728,7 @@ void SwTxtFrm::Paint( const SwRect &rRect ) const
                 //DBG_LOOP; shadows declaration above.
                 //resolved into:
 #if  OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 5a0a600370aa..a63aaec37363 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -176,7 +176,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     {
         nCutPos = rInf.GetTxtBreak( nLineWidth, nMaxLen, nMaxComp );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if ( STRING_LEN != nCutPos )
         {
             rInf.GetTxtSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 46e74abe1da3..e161b2340df7 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -114,13 +114,13 @@ namespace numfunc
 }
 // <--
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // Test2: WYSIWYG++
 // Test4: WYSIWYG debug
 static sal_Bool bDbgLow = sal_False;
 #endif
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 sal_Bool SwTxtSizeInfo::IsOptCalm() const { return !GetOpt().IsTest3(); }
 
@@ -236,7 +236,7 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
 { }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*************************************************************************
  *                      ChkOutDev()
  *************************************************************************/
@@ -288,7 +288,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
 }
@@ -325,7 +325,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
         pRef = pOut;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
 
@@ -412,7 +412,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkOutDev( *this );
 #endif
     SetLen( GetMinLen( *this ) );
@@ -570,7 +570,7 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
     pGrammarCheckList = NULL;
     pSmartTags = NULL;  // SMARTTAGS
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     pBrushItem = 0;
 #else
     pBrushItem = ((SvxBrushItem*)-1);
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 42873bf67ff2..77b6e03d4f26 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -79,7 +79,7 @@ class SwWrongList;
 #define DIR_RIGHT2LEFT 2
 #define DIR_TOP2BOTTOM 3
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define OPTCALM( rInf )  (rInf).IsOptCalm()
 #define OPTLOW( rInf )   (rInf).IsOptLow()
 #define OPTDBG( rInf )   (rInf).IsOptDbg()
@@ -380,7 +380,7 @@ public:
         { return ( pKanaComp && nKanaIdx < pKanaComp->Count() )
                    ? (*pKanaComp)[nKanaIdx] : 0; }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_Bool IsOptCalm() const;
     sal_Bool IsOptLow() const;
     sal_Bool IsOptDbg() const;
@@ -423,7 +423,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
     void _DrawBackBrush( const SwLinePortion &rPor ) const;
 
 protected:
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;}
 #else
     SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0;
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 965de6545fe2..b972f1e437b9 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -104,7 +104,7 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
     pInf = pNewInf;
     SwFont *pMyFnt = GetFnt();
     GetInfo().SetFont( pMyFnt );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( ALIGN_BASELINE != pMyFnt->GetAlign() )
     {
         ASSERT( ALIGN_BASELINE == pMyFnt->GetAlign(),
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 6dec3c790283..6a656bef5451 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -114,7 +114,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
 
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const xub_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
         ASSERT( CH_BLANK  == cChar || CH_BULLET == cChar,
                 "SwGluePortion::Paint: blank expected" );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index a9272d077170..4a69f12097dd 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1282,7 +1282,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         nLastKashida = nChg;
     };
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // check kashida data
     long nTmpKashidaPos = -1;
     sal_Bool bWrongKash = sal_False;
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index db21e72d04ec..540c7bad3a4d 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -258,7 +258,7 @@ public:
                            const SwLinePortion* _pDontConsiderPortion = NULL,
                            const bool _bNoFlyCntPorAndLinePor = false ) const;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void DebugPortions( SvStream &rOs, const XubString &rTxt,
                         const xub_StrLen nStart ); //$ ostream
 #endif
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 08561df3f3b6..f05a4677a592 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -47,7 +47,7 @@
 #include "porglue.hxx"
 #include "inftxt.hxx"
 #include "blink.hxx"
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 sal_Bool ChkChain( SwLinePortion *pStart )
 {
@@ -216,7 +216,7 @@ SwLinePortion *SwLinePortion::Insert( SwLinePortion *pIns )
 {
     pIns->FindLastPortion()->SetPortion( pPortion );
     SetPortion( pIns );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkChain( this );
 #endif
     return pIns;
@@ -247,7 +247,7 @@ SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
     SwLinePortion *pPos = FindLastPortion();
     pPos->SetPortion( pIns );
     pIns->SetPortion( 0 );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ChkChain( this );
 #endif
     return pIns;
@@ -307,7 +307,7 @@ SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
     return SwPosSize();
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                virtual SwLinePortion::Check()
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 7777e5968969..89887d2b4955 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -42,7 +42,7 @@ class SwPortionHandler;
 // Das CLASSIO-Makro implementiert die 'freischwebende' Funktion.
 // Auf diese Weise erhaelt man beide Vorteile: virtuelle Ausgabeoperatoren
 // und allgemeine Verwendbarkeit.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define OUTPUT_OPERATOR  virtual SvStream &operator<<( SvStream & aOs ) const;
 #else
 #define OUTPUT_OPERATOR
@@ -177,7 +177,7 @@ public:
     virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
     void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
 
-#ifndef PRODUCT
+#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 706eca2ec52e..561c1abf2923 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -98,7 +98,7 @@
 #include <svx/svdoedge.hxx>
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include "viewopt.hxx"  // SwViewOptions, nur zum Testen (Test2)
 #endif
 #include "doc.hxx"
@@ -1817,7 +1817,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
 
         delete pPolyPolygon;
         // UPPER_LOWER_TEST
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwRootFrm* pTmpRootFrm = pFmt->getIDocumentLayoutAccess()->GetRootFrm();
         if( pTmpRootFrm->GetCurrShell() )
         {
@@ -1890,7 +1890,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
  *                      SwContourCache::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
     const Color& rClosedColor, const Color& rOpenColor )
@@ -1941,7 +1941,7 @@ void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
  *                      SwTxtFly::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 void SwTxtFly::ShowContour( OutputDevice* pOut )
 {
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index f7dd3e1c592e..e9cca9b19d87 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -102,7 +102,7 @@ public:
                                        const long nXPos,
                                        const sal_Bool bRight );
     // <--
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
                       const Color& rClosedColor, const Color& rOpenColor );
 #endif
@@ -235,7 +235,7 @@ public:
     }
     // <--
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     void ShowContour( OutputDevice* pOut );
 #endif
 };
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index b5ce2df1dc75..b2d443083f4a 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -106,7 +106,7 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
  *                              CalcFtnFlag()
  *************************************************************************/
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 void SwTxtFrm::CalcFtnFlag()
 #else
 void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
@@ -120,7 +120,7 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
 
     const MSHORT nSize = pHints->Count();
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     const xub_StrLen nEnd = GetFollow() ? GetFollow()->GetOfst() : STRING_LEN;
 #else
     const xub_StrLen nEnd = nStop != STRING_LEN ? nStop
@@ -364,7 +364,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
         SwTwips nTmp = (*fnRect->fnYDiff)( (pCont->*fnRect->fnGetPrtBottom)(),
                                            (Frm().*fnRect->fnGetTop)() );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( nTmp < 0 )
         {
             sal_Bool bInvalidPos = sal_False;
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index d00c29865b0b..8e3d67698e2b 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -47,7 +47,7 @@
 #include <guess.hxx>    //
 #include <splargs.hxx>  // SwInterHyphInfo
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 extern const sal_Char *GetLangName( const MSHORT nLang );
 #endif
 
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 5bfad43be0b9..03dda0aad402 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -79,7 +79,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 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     , "static SwTxtFrm::pTxtCache"
 #endif
     );
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 0df7da5f8494..e75944bc85a1 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sw.hxx"
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #error Wer fummelt denn an den makefiles?
 #endif
 
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index b756567d8106..fab41e155639 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -122,7 +122,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
 #endif
         }
 #if OSL_DEBUG_LEVEL > 1
-#ifndef PRODUCT
+#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 da1c14121b4a..73ab5d16f788 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -71,7 +71,7 @@ inline SwSaveClip::~SwSaveClip()
     Reset();
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                          class SwDbgOut
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 56b8ec9afdf4..aac39d5b2643 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -322,7 +322,7 @@ SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const xub_Unicode cFillCh
     : SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar)
 {
     nLineLength = 1;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( IsFilled() )
     {
         ASSERT( ' ' != cFill, "SwTabPortion::CTOR: blanks ?!" );
@@ -557,7 +557,7 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
 
 void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wir wollen uns die Fixbreite anzeigen
     if( rInf.OnWin() && OPTDBG( rInf ) &&
         !rInf.GetOpt().IsPagePreview() && \
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 95805c8203c1..daa2ed84d386 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -62,12 +62,12 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
         }
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "IndexEntrySupplierWrapper: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -88,12 +88,12 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
         sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getIndexKey: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -109,12 +109,12 @@ String IndexEntrySupplierWrapper::GetFollowingText( BOOL bMorePages ) const
         sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getIndexFollowPageWord: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -132,12 +132,12 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
         sRet = xIES->getAlgorithmList( rLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "getAlgorithmList: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -155,12 +155,12 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "loadAlgorithm: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -181,12 +181,12 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
                                         rTxt2, rTxtReading2, rLocale2 );
     }
     catch ( UNO_NMSPC::Exception&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         e
 #endif
         )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ByteString aMsg( "compareIndexEntry: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 555ff8e39171..4a934d395d27 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -191,7 +191,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
                 {
                     SwPosition aPos( *pNd );
                     const SwDoc& rDoc = *pNd->GetDoc();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ),
                             "wo steht der Absatz" );
 #else
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index d58236da16b9..63e87c962b7b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1041,7 +1041,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     // a window. Therefore bUseSrcFont is always 0 in this case.
     //
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
     const BOOL bNoAdjust = bPrt ||
             (  pWin &&
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index d9bd1bb44b03..02bb4dd358e6 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -707,7 +707,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
         ASSERT( nPos, "nextCharBlock not implemented?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !nPos )
             nPos = nMaxPos;
 #endif
@@ -821,7 +821,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
         ASSERT( nPos, "endOfCharBlock not implemented?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !nPos )
             nPos = nMaxPos;
 #endif
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index bd7da5b7d1f6..339b7c905158 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -45,7 +45,7 @@ _SV_IMPL_SORTAR_ALG( SwpHtEnd, SwTxtAttr* )
 void DumpHints( const SwpHtStart &rHtStart,
                 const SwpHtEnd &rHtEnd )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     aDbstream << "DumpHints:" << endl;
     (aDbstream << "\tStarts:" ).WriteNumber(rHtStart.Count()) << endl;
     for( USHORT i = 0; i < rHtStart.Count(); ++i )
@@ -240,14 +240,14 @@ BOOL SwpHtEnd::Seek_Entry( const SwTxtAttr *pElement, USHORT *pPos ) const
 void SwpHintsArr::Insert( const SwTxtAttr *pHt )
 {
     Resort();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nPos;
     ASSERT(!SwpHtStart::Seek_Entry( pHt, &nPos ), "Insert: hint already in HtStart");
     ASSERT(!aHtEnd.Seek_Entry( pHt, &nPos ), "Insert: hint already in HtEnd");
 #endif
     SwpHtStart::Insert( pHt );
     aHtEnd.Insert( pHt );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     (aDbstream << "Insert: " ).WriteNumber( long( pHt ) )<< endl;
     DumpHints( *this, aHtEnd );
@@ -266,7 +266,7 @@ void SwpHintsArr::DeleteAtPos( const USHORT nPos )
     USHORT nEndPos;
     aHtEnd.Seek_Entry( pHt, &nEndPos );
     aHtEnd.Remove( nEndPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     (aDbstream << "DeleteAtPos: " ).WriteNumber( long( pHt ) )<< endl;
     DumpHints( *this, aHtEnd );
@@ -274,7 +274,7 @@ void SwpHintsArr::DeleteAtPos( const USHORT nPos )
 #endif
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 /*************************************************************************
  *                      SwpHintsArr::Check()
@@ -399,7 +399,7 @@ BOOL SwpHintsArr::Resort()
         if( pLast && !lcl_IsLessStart( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 //            ASSERT( bResort, "!Resort/Start: correcting hints-array" );
             aDbstream << "Resort: Starts" << endl;
             DumpHints( *this, aHtEnd );
@@ -422,7 +422,7 @@ BOOL SwpHintsArr::Resort()
         if( pLast && !lcl_IsLessEnd( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             aDbstream << "Resort: Ends" << endl;
             DumpHints( *this, aHtEnd );
 #endif
@@ -438,7 +438,7 @@ BOOL SwpHintsArr::Resort()
         }
         pLast = pHt;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifdef NIE
     aDbstream << "Resorted:" << endl;
     DumpHints( *this, aHtEnd );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index b9ff68e3d422..ad35bdeb53a2 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -116,7 +116,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.
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define CHECK_SWPHINTS(pNd)  { if( pNd->GetpSwpHints() && \
                                    !pNd->GetDoc()->IsInReading() ) \
                                   pNd->GetpSwpHints()->Check(); }
@@ -368,7 +368,7 @@ void lcl_ChangeFtnRef( SwTxtNode &rNode )
                             ((SwTxtFrm*)pFrm)->SetFtn( TRUE );
                         }
                     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     while( 0 != (pCntnt = (SwCntntFrm*)aIter.Next()) )
                     {
                         SwFtnFrm *pDbgFtn = pCntnt->FindFtnFrm();
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index c70d8aaa4a14..b7489a8f23ef 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -88,7 +88,7 @@
 #define FNT_ATM_HACK
 #endif
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // globale Variable
 SvStatistics aSvStat;
 #endif
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 74bb3e87e87e..797e4269689e 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -89,7 +89,7 @@
 #include <algorithm>
 #include <map>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #define CHECK    Check();
 #else
 #define CHECK
@@ -289,7 +289,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, USHORT nMod
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
@@ -975,11 +975,11 @@ BOOL SwTxtNode::Insert( SwTxtAttr *pAttr, USHORT nMode )
                 // FussNote im Redline-Bereich NICHT ins FtnArray einfuegen!
                 if( StartOfSectionIndex() > rNodes.GetEndOfRedlines().GetIndex() )
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     const BOOL bSuccess =
 #endif
                         pDoc->GetFtnIdxs().Insert( pTxtFtn );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ASSERT( bSuccess, "FtnIdx nicht eingetragen." );
 #endif
                 }
@@ -2157,7 +2157,7 @@ void SwpHints::Insert( SwTxtAttr* pHint, SwTxtNode &rNode, USHORT nMode )
     {
         SwpHintsArr::Insert( pHint );
         CalcFlags();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( !rNode.GetDoc()->IsInReading() )
             CHECK;
 #endif
@@ -2245,7 +2245,7 @@ void SwpHints::Insert( SwTxtAttr* pHint, SwTxtNode &rNode, USHORT nMode )
         rNode.Modify( 0, &aHint );
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( !bNoHintAdjustMode && !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index d62b1bc31ff5..a55678eca057 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -86,7 +86,7 @@ SwTxtCharFmt::~SwTxtCharFmt( )
 void SwTxtCharFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( (nWhich<RES_CHRATR_BEGIN || nWhich>RES_CHRATR_END)
             && (nWhich!=RES_OBJECTDYING)
             && (nWhich!=RES_ATTRSET_CHG)
@@ -184,7 +184,7 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
 void SwTxtINetFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( (nWhich<RES_CHRATR_BEGIN || nWhich>RES_CHRATR_END)
             && (nWhich!=RES_OBJECTDYING)
             && (nWhich!=RES_ATTRSET_CHG)
@@ -247,7 +247,7 @@ SwTxtRuby::~SwTxtRuby()
 void SwTxtRuby::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( (nWhich<RES_CHRATR_BEGIN || nWhich>RES_CHRATR_END)
             && (nWhich!=RES_OBJECTDYING)
             && (nWhich!=RES_ATTRSET_CHG)
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 07eb7182d717..40596c1fb0db 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -203,7 +203,7 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
     USHORT nEnde = UNDO_ACTION_LIMIT;
 
 // nur zum Testen der neuen DOC-Member
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 {
     SwUndoId nId = UNDO_EMPTY;
     USHORT nUndosCnt = 0, nSttEndCnt = 0;
@@ -551,7 +551,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
     pUndoEnd->SetSttOffset( nSize );
 
 // nur zum Testen der Start/End-Verpointerung vom Start/End Undo
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         USHORT nEndCnt = 1, nCnt = pUndos->Count();
         SwUndoId nTmpId = UNDO_EMPTY;
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index df7c138481d4..444b8f148c0c 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -537,7 +537,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
         ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr * pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
         ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 1b7f97b70a20..11611d179407 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -68,7 +68,7 @@ public:
     SwNodeIndex* GetMvSttIdx() const
         { return SwUndoSaveSection::GetMvSttIdx(); }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nRedlineCount;
 #endif
 };
@@ -1071,7 +1071,7 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
         ASSERT( !this, "keine gueltigen Daten!" )
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->GetRedlineTbl().Count();
 #endif
 }
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index baff3c0d5ce6..8462b0daae31 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -559,7 +559,7 @@ void SwUndoSetFlyFmt::Undo( SwUndoIter& rIter )
                 ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                 const xub_StrLen nIdx = pPos->nContent.GetIndex();
                 SwTxtAttr * pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                             "Missing FlyInCnt-Hint." );
                 ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index cbe7d97cd05b..c96067b13bfd 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -68,7 +68,7 @@
 #endif
 #include <unochart.hxx>
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define CHECK_TABLE(t)
 #else
 #ifdef DEBUG
@@ -78,7 +78,7 @@
 #endif
 #endif
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     #define _DEBUG_REDLINE( pDoc )
 #else
     void lcl_DebugRedline( const SwDoc* pDoc );
@@ -196,7 +196,7 @@ public:
 void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 );
 void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos = 0 );
 
-#if defined( JP_DEBUG ) && !defined( PRODUCT )
+#if defined( JP_DEBUG ) && defined(DBG_UTIL)
 #include "shellio.hxx"
 void DumpDoc( SwDoc* pDoc, const String& rFileNm );
 void CheckTable( const SwTable& );
@@ -3220,7 +3220,7 @@ void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos )
         *pInsPos = nU;
 }
 
-#if defined( JP_DEBUG ) && !defined( PRODUCT )
+#if defined( JP_DEBUG ) && defined(DBG_UTIL)
 
 
 void DumpDoc( SwDoc* pDoc, const String& rFileNm )
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 7429eb5c444d..da9800c9068a 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -45,7 +45,7 @@
 /// include <svx/svdoutl.hxx>
 #include <svx/svdoutl.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _SVX_FMGLOB_HXX
 #include <svx/fmglob.hxx>
 #endif
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index e5f901b43f30..35aeb1cda89a 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -407,7 +407,7 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
     UISizeNotify();
     ++nStartAction;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // test option 'No Scroll' suppresses the automatic repair of the scrolled area
     if ( !GetViewOptions()->IsTest8() )
 #endif
@@ -589,7 +589,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
                     EndAction();
                 } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- );
             }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
             {
                 //MA: 04. Nov. 94, braucht doch keiner oder??
@@ -746,7 +746,7 @@ void ViewShell::LayoutIdle()
 
     SET_CURR_SHELL( this );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Wenn Test5 gedrueckt ist, wird der IdleFormatierer abgeknipst.
     if( pOpt->IsTest5() )
         return;
@@ -1146,7 +1146,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
     if ( rRect == VisArea() )
         return;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if ( bInEndAction )
     {
         //Da Rescheduled doch schon wieder irgendwo einer?
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 9e35f8e78768..7a10dca5b421 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -355,7 +355,7 @@ void SwHTMLWriter::OutFootEndNotes()
     if( !pFootEndNotes )
         return;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nFtn = nFootNote, nEn = nEndNote;
 #endif
     nFootNote = 0, nEndNote = 0;
@@ -420,7 +420,7 @@ void SwHTMLWriter::OutFootEndNotes()
         }
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( nFtn == nFootNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
     ASSERT( nEn == nEndNote,
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index cc83cbcd8605..4a07c89612a7 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -912,7 +912,7 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
 {
     ASSERT( nCells < pCells->Count(), "Anzahl Zellen falsch" );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
      sal_uInt16 nEnd = pCells->Count();
 #endif
     // The colspan of empty cells at the end has to be fixed to the new
@@ -930,7 +930,7 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
         else
             break;
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     for( i=nCells; i<nEnd; i++ )
     {
         HTMLTableCell *pCell = (*pCells)[i];
@@ -1790,7 +1790,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
             HTMLTableCell *pCell = GetCell(nTopRow,nCol);
             const sal_Bool bSplit = 1 == pCell->GetColSpan();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( nCol == nRightCol-1 )
             {
                 ASSERT( bSplit, "Split-Flag falsch" );
@@ -3394,7 +3394,7 @@ void _CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts )
 void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
                                   HTMLTable *pCurTable )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // Die Attribute muessen schon beim Auefrauemen des Kontext-Stacks
     // entfernt worden sein, sonst ist etwas schiefgelaufen. Das
     // Checken wir mal eben ...
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1150b044db5b..c4f625920fd7 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -67,7 +67,7 @@
 #include <htmlnum.hxx>
 #include <wrthtml.hxx>
 #include <wrtswtbl.hxx>
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #ifndef _VIEWSH_HXX
 #include <viewsh.hxx>
 #endif
@@ -1200,7 +1200,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ViewShell *pSh;
     rWrt.pDoc->GetEditShell( &pSh );
     if ( pSh && pSh->GetViewOptions()->IsTest1() )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 5c459e9bd0f2..49889e9c39d3 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <stdlib.h>
 #endif
 #include <hintids.hxx>
@@ -308,7 +308,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     // <--
     nOpenParaToken( 0 ),
     eJumpTo( JUMPTO_NONE ),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nContinue( 0 ),
 #endif
     eParaAdjust( SVX_ADJUST_END ),
@@ -438,7 +438,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
 
 __EXPORT SwHTMLParser::~SwHTMLParser()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nContinue, "DTOR im Continue - Das geht schief!!!" );
 #endif
     BOOL bAsync = pDoc->IsInLoadAsynchron();
@@ -589,7 +589,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser()
 
 void __EXPORT SwHTMLParser::Continue( int nToken )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" );
     nContinue++;
 #endif
@@ -615,7 +615,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
         bViewCreated = TRUE;
         pDoc->SetInLoadAsynchron( TRUE );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         nContinue--;
 #endif
 
@@ -725,7 +725,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
                     pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
                 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // !!! sollte nicht moeglich sein, oder ??
 ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
             "Pam.Bound1 steht noch im Node" );
@@ -923,7 +923,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
     // wieder rekonstruieren.
     CallEndAction( TRUE );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nContinue--;
 #endif
 }
@@ -978,7 +978,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
             return ;
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pPendStack )
     {
         switch( nToken )
@@ -2470,12 +2470,12 @@ ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, BOOL bChkPtr )
 
     if( !pVSh || bChkPtr )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ViewShell *pOldVSh = pVSh;
 #endif
         pDoc->GetEditShell( &pVSh );
         ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         if( pOldVSh && !pVSh )
             pVSh = 0;
 #endif
@@ -3885,7 +3885,7 @@ void SwHTMLParser::EndPara( BOOL bReal )
 {
     if( HTML_LI_ON==nOpenParaToken && pTable )
     {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         const SwNumRule *pNumRule = pPam->GetNode()->GetTxtNode()->GetNumRule();
 #endif
         ASSERT( pNumRule, "Wo ist die Numrule geblieben" );
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 45349e626032..7b8f08c4d69a 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -453,7 +453,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
                         JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_uInt16  nContinue;          // Tiefe der Continue-Aufrufe
 #endif
 
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 8b851561292e..7283c640abc3 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -260,7 +260,7 @@ protected:
 
     BOOL bRelWidths : 1;        // Breiten relativ ausgeben?
     BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bGetLineHeightCalled : 1;
 #endif
 
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 2cab705fa8e0..03411abc515f 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -734,7 +734,7 @@ void SwRTFParser::RemoveUnusedNumRule( SwNumRule* pRule )
         }
         pDoc->DelNumRule( pRule->GetName() );
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         ASSERT( pRule, "NumRulePointer 0 kann nicht geloescht werden" );
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index f22145b4ce62..f390f87a4168 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -388,7 +388,7 @@ void SwRTFParser::Continue( int nToken )
                 pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
             }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // !!! sollte nicht moeglich sein, oder ??
 ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
             "Pam.Bound1 steht noch im Node" );
@@ -2210,7 +2210,7 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     SwPaM aPam( *pPam->GetPoint() );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( nSNd <= nENd, "Start groesser als Ende" );
     SwNode* pDebugNd = pDoc->GetNodes()[ nSNd ];
     ASSERT( pDebugNd->IsCntntNode(), "Start kein ContentNode" );
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index b303147a3893..cde2254a1428 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -250,7 +250,7 @@ SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx,
 /////////////////////////////////////////////////////////////////////////////
 
 // Stream-spezifisches
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 SvStream& Writer::Strm()
 {
     ASSERT( pStrm, "Oh-oh. Dies ist ein Storage-Writer. Gleich knallts!" );
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 4c019f0bfdcc..89beab1f0c3a 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -114,7 +114,7 @@ long SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 
 long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BOOL bOldGetLineHeightCalled = bGetLineHeightCalled;
     bGetLineHeightCalled = TRUE;
 #endif
@@ -135,7 +135,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
         // <--
         bUseLayoutHeights = bLayoutAvailable; /*FALSE;*/
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         ASSERT( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout ungueltig?" );
 #endif
     }
@@ -431,7 +431,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
     BOOL bSubExpanded = FALSE;
     USHORT nLines = rLines.Count();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     USHORT nEndCPos = 0;
 #endif
 
@@ -467,11 +467,11 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
         }
         else
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             long nCheckPos = nRPos + GetLineHeight( pLine );
 #endif
             nRPos = nStartRPos + nParentLineHeight;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SwWriteTableRow aRow( nStartRPos + nParentLineHeight, bUseLayoutHeights );
             ASSERT( aRows.Seek_Entry(&aRow),
                     "Parent-Zeile nicht gefunden" );
@@ -514,7 +514,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
             }
             else
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 USHORT nCheckPos = nCPos + (USHORT)GetBoxWidth( pBox );
                 if( !nEndCPos )
                 {
@@ -528,7 +528,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                 }
 #endif
                 nCPos = nStartCPos + nParentLineWidth;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwWriteTableCol aCol( nStartCPos + nParentLineWidth );
                 ASSERT( aCols.Seek_Entry(&aCol),
                         "Parent-Zelle nicht gefunden" );
@@ -594,7 +594,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
         // Und ihren Index
         USHORT nOldRow = nRow;
         SwWriteTableRow aRow( nRPos,bUseLayoutHeights );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         BOOL bFound =
 #endif
             aRows.Seek_Entry( &aRow, &nRow );
@@ -679,7 +679,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
             // Und ihren Index
             USHORT nOldCol = nCol;
             SwWriteTableCol aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             BOOL bFound2 =
 #endif
                 aCols.Seek_Entry( &aCol, &nCol );
@@ -776,7 +776,7 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
     nInnerBorder(0), nBaseWidth(nBWidth), nHeadEndRow(USHRT_MAX),
      nLeftSub(nLSub), nRightSub(nRSub), nTabWidth(nWidth), bRelWidths(bRel),
     bUseLayoutHeights(true),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bGetLineHeightCalled(false),
 #endif
     bColsOption(false), bColTags(true), bLayoutExport(false),
@@ -803,7 +803,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
     nInnerBorder(0), nBaseWidth(pLayoutInfo->GetWidthOption()), nHeadEndRow(0),
     nLeftSub(0), nRightSub(0), nTabWidth(pLayoutInfo->GetWidthOption()),
     bRelWidths(pLayoutInfo->HasPrcWidthOption()), bUseLayoutHeights(false),
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bGetLineHeightCalled(false),
 #endif
     bColsOption(pLayoutInfo->HasColsOption()),
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index f1ca77e20a8e..5e36c9aedb79 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1630,7 +1630,7 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
 BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_CNTNT*/,
                            BOOL bAbsolutePos /*= FALSE*/,
                            const SfxItemSet*
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                pMoreAttrs /*= 0*/
 #endif
                             )
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6aac7b226289..316f31a8d5d5 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -267,7 +267,7 @@ void Ww1SingleSprmPBrc::Start(
     Ww1Shell& rOut, BYTE,
     W1_BRC10* pBrc,
     USHORT
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     nSize
 #endif
     ,
@@ -467,7 +467,7 @@ void Ww1SingleSprmPFInTable::Start(
 
 void Ww1SingleSprmPFInTable::Stop(
     Ww1Shell&
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     rOut
 #endif
     ,
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index bc0bd7806782..fa83fde06733 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2028,7 +2028,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, SwWW8Writer& rWW8Wrt)
                         if (bSwapInPage)
                             (const_cast<SdrObject*>(pSdrObj))->SetPage(0);
                     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     else
                         ASSERT( !this, "Where is the SDR-Object?" );
 #endif
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2d6f3b73f5a3..132be6f5d123 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1056,13 +1056,13 @@ void WW8_SwAttrIter::FieldVanish( const String& rTxt )
 
 void WW8_SwAttrIter::OutSwTOXMark(const SwTOXMark& rAttr,
     bool
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bStart
 #endif
     )
 {
     // its a field; so get the Text form the Node and build the field
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     ASSERT( bStart, "calls only with the startposition!" );
 #endif
     String sTxt;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c77427c39c7f..076edb419fa8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -721,7 +721,7 @@ ULONG SwWW8Writer::FillUntil( SvStream& rStrm, ULONG nEndPos )
 
     if( nEndPos > nCurPos )
         SwWW8Writer::FillCount( rStrm, nEndPos - nCurPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( nEndPos == nCurPos, "Falsches FillUntil()" );
 #endif
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 884426f129c5..d0e09c58a759 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3514,7 +3514,7 @@ ULONG SwWW8Writer::ReplaceCr( BYTE nChar )
         pChpPlc->AppendFkpEntry(rStrm.Tell());
         nRetPos = rStrm.Tell();
     }
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     else
     {
         ASSERT( nRetPos || nPos == (ULONG)pFib->fcMin,
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e636a47a66f0..da3533819223 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -283,7 +283,7 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
     {
         if( pTabDesc && pTabDesc->getOldRedlineStack() )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             ASSERT( pTabDesc->getOldRedlineStack()->close(rPos, eType), "close without open!");
 #else
             pTabDesc->getOldRedlineStack()->close( rPos, eType );
@@ -1469,7 +1469,7 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
     if (nLen != 6)
         return;
     mbHasSpacing=true;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BYTE nWhichCell =
 #endif
             *pParams++;
@@ -1523,7 +1523,7 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
 
     ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     BYTE nUnknown2 =
 #endif
             *pParams++;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 5e5759923e71..8a2763c22cf1 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4629,7 +4629,7 @@ void SwWW8ImplReader::Read_ParaBackColor(USHORT, const BYTE* pData, short nLen)
 
 sal_uInt32 SwWW8ImplReader::ExtractColour(const BYTE* &rpData,
     bool
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         bVer67
 #endif
     )
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 2cb78f0bae4c..fefa151125f9 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -686,7 +686,7 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
             if( nPoint < pRedlineInfo->pContentIndex->GetIndex() ||
                 nPoint > pRedlineInfo->pContentIndex->GetNode().EndOfSectionIndex() )
                 pRedline->SetContentIdx(pRedlineInfo->pContentIndex);
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             else
                 ASSERT( false, "Recursive change tracking" );
 #endif
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f4a4a676c9a2..9c8ab5a85d6f 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -87,7 +87,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
     if( eFamily != XML_TOKEN_INVALID )
         AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // style:parent-style-name="..." (if its not the default only)
     const SwFmt* pParent = rFmt.DerivedFrom();
     // Parent-Namen nur uebernehmen, wenn kein Default
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 44744f0d18a2..8dd5f415f1f8 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -842,7 +842,7 @@ void SwXMLImport::endDocument( void )
                                             pTxtNode->GetTxt().Len() );
                 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 // !!! This should be impossible !!!!
                 ASSERT( pSttNdIdx->GetIndex()+1 !=
                                         pPaM->GetBound( sal_True ).nNode.GetIndex(),
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 360f8349142e..8e0c5acbd7f4 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -142,7 +142,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     pLines( &rLines ),
     nWidth( 0UL )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     sal_uInt16 nEndCPos = 0U;
 #endif
     sal_uInt16 nLines = rLines.Count();
@@ -176,7 +176,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
             }
             else
             {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 sal_uInt16 nCheckPos =
                     nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
                 if( !nEndCPos )
@@ -193,7 +193,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
                 }
 #endif
                 nCPos = (sal_uInt16)nWidth;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 SwXMLTableColumn_Impl aCol( (sal_uInt16)nWidth );
                 ASSERT( aCols.Seek_Entry(&aCol), "couldn't find last column" );
                 ASSERT( SwXMLTableColumn_Impl(nCheckPos) ==
@@ -699,7 +699,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
             // Und ihren Index
             sal_uInt16 nOldCol = nCol;
             SwXMLTableColumn_Impl aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Bool bFound =
 #endif
                 pLines->GetColumns().Seek_Entry( &aCol, &nCol );
@@ -989,7 +989,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const sal_uInt16 nOldCol = nCol;
             {
                 SwXMLTableColumn_Impl aCol( nCPos );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 const sal_Bool bFound =
 #endif
                     rLines.GetColumns().Seek_Entry( &aCol, &nCol );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 6ae1bf52931c..b1131027cf37 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2249,7 +2249,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                 bSplit = 1UL == pCell->GetColSpan();
             }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if( nCol == nRightCol-1UL )
             {
                 ASSERT( bSplit, "Split-Flag falsch" );
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index da681b63b077..4964a1cbe753 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -148,7 +148,7 @@ SfxItemSet*  SwModule::CreateItemSet( USHORT nId )
                                     SID_ATTR_LANGUAGE,      SID_ATTR_LANGUAGE,
                                     SID_ATTR_CHAR_CJK_LANGUAGE,   SID_ATTR_CHAR_CJK_LANGUAGE,
                                     SID_ATTR_CHAR_CTL_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE,
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                     FN_PARAM_SWTEST,        FN_PARAM_SWTEST,
 #endif
                                     0);
@@ -273,7 +273,7 @@ SfxItemSet*  SwModule::CreateItemSet( USHORT nId )
         pRet->Put(SvxBrushItem(aViewOpt.GetRetoucheColor(), RES_BACKGROUND));
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     /*-----------------01.02.97 13.02-------------------
         Test-Optionen
     --------------------------------------------------*/
@@ -479,7 +479,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     /*--------------------------------------------------------------------------
                 Writer Testseite auswerten
     ----------------------------------------------------------------------------*/
@@ -602,7 +602,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
             }
         }
         break;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         case  RID_SW_TP_OPTTEST_PAGE:
         {
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index e355dcba5e64..5344551d930b 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -653,7 +653,7 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                             pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
                     }
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 else
                     ASSERT( !this, "ohne Sw3Reader geht nichts" );
 #endif
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 1ca465678def..cf74d3eaec52 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -407,7 +407,7 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const
     rVOpt.SetShdwCrsrFillMode( eMode );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 082269122539..88d128d481a5 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2435,7 +2435,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 }
 
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*******************************************************
  ******************************************************/
 /*----------------- OS 11.01.95  -----------------------
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index af43528016f9..9a800ebdb02d 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -61,7 +61,7 @@
 
 #include <svx/acorrcfg.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 BOOL   SwViewOption::bTest9 = FALSE;        //DrawingLayerNotLoading
 #endif
 Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY);
@@ -114,7 +114,7 @@ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
             && bFormView == rOpt.IsFormView()
             && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode
             && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             // korrespondieren zu den Angaben in ui/config/cfgvw.src
             && bTest1 == rOpt.IsTest1()
             && bTest2 == rOpt.IsTest2()
@@ -245,7 +245,7 @@ SwViewOption::SwViewOption() :
 
     bSelectionInReadonly = SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // korrespondieren zu den Angaben in ui/config/cfgvw.src
     bTest1 = bTest2 = bTest3 = bTest4 =
              bTest5 = bTest6 = bTest7 = bTest8 = bTest10 = FALSE;
@@ -280,7 +280,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bTest1          = rVOpt.bTest1      ;
     bTest2          = rVOpt.bTest2      ;
     bTest3          = rVOpt.bTest3      ;
@@ -320,7 +320,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bTest1          = rVOpt.bTest1      ;
     bTest2          = rVOpt.bTest2      ;
     bTest3          = rVOpt.bTest3      ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 627676707214..9880c8f43efb 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1702,7 +1702,7 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
             break;
         case RID_SW_TP_OPTTEST_PAGE :
         case TP_OPTTEST_PAGE :
-#ifndef  PRODUCT
+#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 5166f0f01d5c..fa9a0f3e77bb 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -156,7 +156,7 @@
 #include "postit.hxx"
 
 //JP 11.10.2001: enable test code for bug fix 91313
-#if !defined( PRODUCT ) && (OSL_DEBUG_LEVEL > 1)
+#if defined(DBG_UTIL) && (OSL_DEBUG_LEVEL > 1)
 //#define TEST_FOR_BUG91313
 #endif
 
@@ -1503,7 +1503,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
         case KS_CheckKey:
             eKeyState = KS_KeyToView;       // default weiter zur View
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             // JP 19.01.99: zum Umschalten des Cursor Verhaltens in ReadOnly
             //              Bereichen
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index bf60c53372b2..eff8acc720df 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -34,7 +34,7 @@
 #include <hintids.hxx>
 
 #include <doc.hxx>
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 #include <stdio.h>
 #endif
 
@@ -157,7 +157,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                     SwContentAtPos::SW_TOXMARK |
                                     SwContentAtPos::SW_REFMARK |
                                     SwContentAtPos::SW_SMARTTAG |
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                                     SwContentAtPos::SW_TABLEBOXVALUE |
                         ( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) |
 #endif
@@ -171,7 +171,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " ));
                 sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula();
                 break;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             case SwContentAtPos::SW_TABLEBOXVALUE:
             {
                 sTxt = UniString(
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index de5197af2622..54e2e99657bf 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -137,7 +137,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
 
     if ( bEnable )
         aColField.GrabFocus();
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
         ASSERT( pButton == &aPageButton, "NewButton?" );
 #endif
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 620d3ac52b23..95c042b8181c 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -39,7 +39,7 @@
 
 class SwWriterApp;
 class SwModule;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 class SwTestTabPage;
 #endif
 class SwAddPrinterTabPage;
@@ -207,7 +207,7 @@ public:
     void SetOn( BOOL bFlag )            { bOn = bFlag; }
 };
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 /*--------OS 12.01.95 -----------------------------------
 Item fuer Einstellungsdialog - Testeinstellungen
 --------------------------------------------------------- */
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 592c581f4aa3..959c4dc4fdd6 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -466,7 +466,7 @@ public:
  TabPage Testeinstellungen fuer SW
 --------------------------------------------------------- */
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
 class SwTestTabPage : public SfxTabPage
 {
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index c3ee9a18ccf0..cd450bc8134b 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -2538,7 +2538,7 @@ USHORT  SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
             SID_ATTR_LONG_ULSPACE, SID_ATTR_LONG_LRSPACE,
             SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0
         };
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     {
         const USHORT* pPtr = aInval + 1;
         do {
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index c5602411f324..65f4ae6240cf 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -428,7 +428,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
         }
         break;
         default:
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             if(nSlot)
             {
                 ByteString sStr( "nSlot: " );
author	Mathias Bauer <mba@openoffice.org>	2009-07-10 14:03:42 +0200
committer	Mathias Bauer <mba@openoffice.org>	2009-07-10 14:03:42 +0200
commit	b2bebad78498c79c2a55ae5cf4ee947070c1e21b (patch)
tree	b03ee0382969abb7cbe842a085c2c129a186eca0 /sw
parent	bc3bba74e94d7c1e0f22e9c14f739683200713ad (diff)