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

9 files changed, 11 insertions, 11 deletions

diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx
index 7491b2bb1cc5..a0d07d999c60 100644
--- a/svx/source/cui/treeopt.cxx
+++ b/svx/source/cui/treeopt.cxx
@@ -2032,7 +2032,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                          ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
                         AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
 #endif
             }
@@ -2048,7 +2048,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                     if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
                 }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
 #endif
             }
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
index 59292068852b..6fad7cb03f58 100644
--- a/svx/source/dialog/impgrf.cxx
+++ b/svx/source/dialog/impgrf.cxx
@@ -111,7 +111,7 @@ int LoadGraphic( const String &rPath, const String &rFilterName,
         nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream,
                                        nFilter, pDeterminedFormat );
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( nRes )
     {
         if( pMed )
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index 9a0b1d593f40..2cff5e76dded 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -1117,7 +1117,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
             break;
             default:
             {
-                #if (OSL_DEBUG_LEVEL > 1) && !defined( PRODUCT )
+                #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
                     if ( ( nCode == KEY_W ) && rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
                     {
                         SfxItemSet aAttribs = pEditView->GetAttribs();
diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx
index 88e1543ab8c9..a6f9faf6eff4 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/svx/source/editeng/svxacorr.cxx
@@ -1385,7 +1385,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
         if( pLists )
             pLists->SaveCplSttExceptList();
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         DBG_ERROR("speichern einer leeren Liste?");
@@ -1401,7 +1401,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
         if(pLists)
             pLists->SaveWrdSttExceptList();
     }
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     else
     {
         DBG_ERROR("speichern einer leeren Liste?");
diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx
index 223219ae4b6a..7a33745fd974 100644
--- a/svx/source/editeng/txtrange.cxx
+++ b/svx/source/editeng/txtrange.cxx
@@ -67,7 +67,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
     bInner( bInnr ),
     bVertical( bVert )
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE;
 #endif
     pRangeArr = new Range[ nCacheSize ];
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index 80af583638e8..f9d9cc97f59d 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -283,7 +283,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     rText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SvxLineSpacingItem" ));
 #else
     rText.Erase();
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 84ddc594f97e..0d47c0e81170 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1293,7 +1293,7 @@ XubString SdrView::GetStatusText()
         aStr.SearchAndReplaceAscii("%2", UniString::CreateFromInt32(nLin + 1));
         aStr.SearchAndReplaceAscii("%3", UniString::CreateFromInt32(nCol + 1));
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         aStr += UniString( RTL_CONSTASCII_USTRINGPARAM( ", Level " ) );
         aStr += UniString::CreateFromInt32( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index 417c72cf02b1..b4aaa497d2ef 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -44,7 +44,7 @@
 #include "svxrtf.hxx"
 
 
-#ifdef PRODUCT
+#ifndef DBG_UTIL
 #undef DEBUG_JP
 #endif
 
diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx
index f2628f181d31..b8dca94fec93 100644
--- a/svx/source/svxlink/fileobj.cxx
+++ b/svx/source/svxlink/fileobj.cxx
@@ -422,7 +422,7 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
     if( pStream && ERRCODE_IO_PENDING == pStream->GetError() )
         pStream->ResetError();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
     if( nRes )
     {
         if( xMed.Is() && !pStream )