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

11 files changed, 18 insertions, 24 deletions

diff --git a/svtools/inc/svtools/svarray.hxx b/svtools/inc/svtools/svarray.hxx
index 3ab3676fa5e0..e2348ce428b1 100644
--- a/svtools/inc/svtools/svarray.hxx
+++ b/svtools/inc/svtools/svarray.hxx
@@ -128,7 +128,7 @@ inline void* operator new( size_t, DummyType* pPtr )
 }
 inline void operator delete( void*, DummyType* ) {}
 
-#if defined(PRODUCT)
+#if !defined(DBG_UTIL)
 
 #define _SVVARARR_DEF_GET_OP_INLINE( nm, ArrElem ) \
 ArrElem& operator[](USHORT nP) const { return *(pData+nP); }\
@@ -335,7 +335,7 @@ SV_IMPL_VARARR_GEN( nm, AE, AE & )
 #define SV_IMPL_VARARR_PLAIN( nm, AE ) \
 SV_IMPL_VARARR_GEN( nm, AE, AE )
 
-#if defined(PRODUCT)
+#if !defined(DBG_UTIL)
 
 #define _SVOBJARR_DEF_GET_OP_INLINE( nm,ArrElem )\
 ArrElem& operator[](USHORT nP) const { return *(pData+nP); }\
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index e2b575c7e085..27dd28b5b783 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.hxx
@@ -137,7 +137,7 @@ class SimpleTokenizer_Impl
 
     String getTokStr( /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     // TEST: Token ausgeben
     String getFullTokenStr( /*out*/TokenTypes eType,
         /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos );
diff --git a/svtools/inc/svtools/zforlist.hxx b/svtools/inc/svtools/zforlist.hxx
index 814ca385d61a..22a258d32f88 100644
--- a/svtools/inc/svtools/zforlist.hxx
+++ b/svtools/inc/svtools/zforlist.hxx
@@ -901,7 +901,7 @@ private:
         );
 
     // used as a loop body inside of GetNewCurrencySymbolString() and GetCurrencyEntry()
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     inline
 #endif
         static BOOL ImpLookupCurrencyEntryLoopBody(
diff --git a/svtools/source/config/xmlaccelcfg.cxx b/svtools/source/config/xmlaccelcfg.cxx
index 36886a533413..a2fb5bac5df8 100644
--- a/svtools/source/config/xmlaccelcfg.cxx
+++ b/svtools/source/config/xmlaccelcfg.cxx
@@ -34,12 +34,6 @@
 #include "xmlaccelcfg.hxx"
 
 #include <vector>
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <cppuhelper/implbase1.hxx>
 
@@ -200,7 +194,7 @@ void AttributeListImpl::clear()
     ::std::vector<struct TagAttribute> dummy;
     m_pImpl->vecAttribute.swap( dummy );
 
-    assert( ! getLength() );
+    OSL_ASSERT( ! getLength() );
 }
 
 // ------------------------------------------------------------------
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index eb4e533b628c..c1491571dd1c 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -38,7 +38,7 @@
 
 #include <svtools/treelist.hxx>
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // Prueft Integritaet der Liste nach jeder Operation
 //#define CHECK_INTEGRITY
 #endif
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 135761195e48..aeb1964b3893 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1478,7 +1478,7 @@ long MultiLineEdit::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
 
-#if (OSL_DEBUG_LEVEL > 1) && !defined( PRODUCT )
+#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
     if( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyEvent& rKEvent = *rNEvt.GetKeyEvent();
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index e2e71e86b662..7e2f98d0d37f 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -682,7 +682,7 @@ String SimpleTokenizer_Impl::getTokStr
     return String( pStartPos, (USHORT)( pEndPos - pStartPos ) );
 }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 // TEST: Token ausgeben
 String SimpleTokenizer_Impl::getFullTokenStr( /*out*/TokenTypes eType,
     /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos )
diff --git a/svtools/source/items1/itempool.cxx b/svtools/source/items1/itempool.cxx
index e54bca8d3c19..823658132fe0 100644
--- a/svtools/source/items1/itempool.cxx
+++ b/svtools/source/items1/itempool.cxx
@@ -589,7 +589,7 @@ void SfxItemPool::Delete()
                     for ( USHORT n = (*ppItemArr)->Count(); n; --n, ++ppHtArr )
                         if (*ppHtArr)
                         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                             ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
 #endif
                             delete *ppHtArr;
@@ -598,7 +598,7 @@ void SfxItemPool::Delete()
                 }
                 if ( *ppDefaultItem )
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     SetRefCount( **ppDefaultItem, 0 );
 #endif
                     DELETEZ( *ppDefaultItem );
@@ -621,7 +621,7 @@ void SfxItemPool::Delete()
             for ( USHORT n = (*ppItemArr)->Count(); n; --n, ++ppHtArr )
                 if (*ppHtArr)
                 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                     ReleaseRef( **ppHtArr, (*ppHtArr)->GetRefCount() );
 #endif
                     delete *ppHtArr;
@@ -630,7 +630,7 @@ void SfxItemPool::Delete()
         }
         if ( *ppDefaultItem )
         {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             SetRefCount( **ppDefaultItem, 0 );
 #endif
             delete *ppDefaultItem;
diff --git a/svtools/source/numbers/zforfind.cxx b/svtools/source/numbers/zforfind.cxx
index 7aac440e8b58..aa7d75a098b7 100644
--- a/svtools/source/numbers/zforfind.cxx
+++ b/svtools/source/numbers/zforfind.cxx
@@ -53,7 +53,7 @@
 #undef _ZFORFIND_CXX
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #define NF_TEST_CALENDAR 0
 #else
 #define NF_TEST_CALENDAR 0
diff --git a/svtools/source/numbers/zforlist.cxx b/svtools/source/numbers/zforlist.cxx
index b76bf3226b50..fcae93964e72 100644
--- a/svtools/source/numbers/zforlist.cxx
+++ b/svtools/source/numbers/zforlist.cxx
@@ -3227,7 +3227,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
 // static
 // try to make it inline if possible since this a loop body
 // TRUE: continue; FALSE: break loop, if pFoundEntry==NULL dupe found
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 inline
 #endif
     BOOL SvNumberFormatter::ImpLookupCurrencyEntryLoopBody(
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index c7444dd5cbcb..6d6f4f059545 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -66,7 +66,7 @@ struct SvParser_Impl
     rtl_TextToUnicodeConverter hConv;
     rtl_TextToUnicodeContext   hContext;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     SvFileStream aOut;
 #endif
 
@@ -100,7 +100,7 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
     pTokenStack = new TokenStackType[ nTokenStackSize ];
     pTokenStackPos = pTokenStack;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
 
     // wenn die Datei schon existiert, dann Anhaengen:
     if( !pImplData )
@@ -119,7 +119,7 @@ SvParser::SvParser( SvStream& rIn, BYTE nStackSize )
 
 SvParser::~SvParser()
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << "\n\n >>>>>>>>>>>>>>> Dump Ende <<<<<<<<<<<<<<<\n";
     pImplData->aOut.Close();
@@ -417,7 +417,7 @@ sal_Unicode SvParser::GetNextChar()
             return sal_Unicode(EOF);
     }
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( pImplData->aOut.IsOpen() )
         pImplData->aOut << ByteString::ConvertFromUnicode( c,
                                                 RTL_TEXTENCODING_MS_1251 );