[Libreoffice-commits] .: svl/inc sw/inc sw/source

[Michael Meeks]

 svl/inc/svl/svarray.hxx         |    6 +++---
 sw/inc/index.hxx                |    2 +-
 sw/source/core/bastyp/index.cxx |    2 +-
 sw/source/core/undo/rolbck.cxx  |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 26bd18dfc2516aab507dfb478cfc31e4bf57442f
Author: Laurent Balland-Poirier <jumbo4444 at yahoo.fr>
Date:   Tue Feb 14 22:39:47 2012 +0100

    EasyHack 42790: get rid of PRODUCT
    
    Preprocessor constant PRODUCT is replaced by !DBG_UTIL

diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index d500ca6..2a2c6a8 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -112,7 +112,7 @@ inline void* operator new( size_t, DummyType* pPtr )
 }
 inline void operator delete( void*, DummyType* ) {}
 
-#if defined(PRODUCT)
+#ifndef DBG_UTIL
 
 #define _SVVARARR_DEF_GET_OP_INLINE( nm, ArrElem ) \
 ArrElem& operator[](sal_uInt16 nP) const { return *(pData+nP); }\
@@ -128,7 +128,7 @@ void Insert( const nm * pI, sal_uInt16 nP,\
 
 #define _SVVARARR_IMPL_GET_OP_INLINE( nm, ArrElem )
 
-#else
+#else // DBG_UTIL
 
 #define _SVVARARR_DEF_GET_OP_INLINE( nm,ArrElem )\
 ArrElem& operator[](sal_uInt16 nP) const;\
@@ -150,7 +150,7 @@ void nm::Insert( const nm *pI, sal_uInt16 nP, sal_uInt16 nStt, sal_uInt16 nE)\
         Insert( (const ArrElem*)pI->pData+nStt, (sal_uInt16)nE-nStt, nP );\
 }
 
-#endif
+#endif // DBG_UTIL
 
 #define _SV_DECL_VARARR_GEN(nm, AE, IS, AERef, vis )\
 typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 8d183db..a47bbaf 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -211,7 +211,7 @@ inline SwIndex& SwIndex::operator= ( xub_StrLen const nVal )
     return *this;
 }
 
-#endif // PRODUCT
+#endif // ifndef DBG_UTIL
 
 #endif
 
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 88ee1d3..37a6c60 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -406,7 +406,7 @@ SwIndex& SwIndex::operator= ( xub_StrLen const nVal )
     return *this;
 }
 
-#endif // ifndef PRODUCT
+#endif // ifdef DBG_UTIL
 
 void SwIndexReg::MoveTo( SwIndexReg& rArr )
 {
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index cdb85b9..8e00a53 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -829,7 +829,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const SfxItemSet& rSet,
     {
         const sal_uInt16 nWhich = aIter.GetCurItem()->Which();
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
         switch (nWhich)
         {
             case RES_TXTATR_REFMARK:
@@ -845,7 +845,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const SfxItemSet& rSet,
                     "\nnot such a good idea");
                 break;
         }
-#endif
+#endif // DBG_UTIL
 
         // Character attribute cannot be inserted into the hints array
         // anymore. Therefore we have to treat them as one RES_TXTATR_AUTOFMT: