remove (un-)definitions of NDEBUG from source files

The build system already defines NDEBUG only if OSL_DEBUG_LEVEL=0 AND
ASSERT_ALWAYS_ABORT=FALSE so the C++ code shouldn't override that.

Change-Id: Ie67a576646cc7e18c3ffac67a3c81b80747ea438

5 files changed, 1 insertions, 33 deletions

diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index fd00bcc7e241..064d12bd1487 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -22,15 +22,6 @@
 
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 
-// Save NDEBUG state
-#ifdef NDEBUG
-#define STREAMHELPER_HXX_HAD_NDEBUG
-#undef NDEBUG
-#endif
-
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
 #include <assert.h>
 
 #define Max( a, b )     (((a)>(b)) ? (a) : (b) )
@@ -94,13 +85,6 @@ public:
 
 };
 
-// Restore NDEBUG state
-#ifdef STREAMHELPER_HXX_HAD_NDEBUG
-#define NDEBUG
-#else
-#undef NDEBUG
-#endif
-
 }
 
 #endif // INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index a8b4e7a70b5b..8c015fc8b797 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -102,13 +102,7 @@
 #include "lwpcelllayout.hxx"
 
 // boost::polymorphic_downcast checks and reports (using assert), if the
-// cast is incorrect. We want this in debug builds.
-#if OSL_DEBUG_LEVEL > 0
-#   undef NDEBUG
-#elif !defined(NDEBUG)
-#   define NDEBUG 1
-#endif
-
+// cast is incorrect (in debug builds).
 using boost::polymorphic_downcast;
 
 /**
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 0708b2e77268..ff7169cfed29 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -24,11 +24,6 @@
  *
  */
 
-#if OSL_DEBUG_LEVEL == 0
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
 #include <assert.h>
 
 #include "ttcr.hxx"
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 290f25132060..f1eb4618d368 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -24,7 +24,6 @@
 #if OSL_DEBUG_LEVEL > 1
 #include <cstdio>
 #define GRLAYOUT_DEBUG 1
-#undef NDEBUG
 #endif
 
 //#define GRLAYOUT_DEBUG 1
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index d198dc678319..e72bb1dca4f4 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -911,7 +911,6 @@ static FILE * grLog()
     else fflush(grLogFile);
     return grLogFile;
 }
-#undef NDEBUG
 #endif
 
 const void * getGrTable(const void* appFaceHandle, unsigned int name, size_t *len)
@@ -962,9 +961,6 @@ GrFontData::~GrFontData()
 
 const void * GrFontData::getTable(unsigned int name, size_t *len) const
 {
-#ifdef DEBUG
-#undef NDEBUG
-#endif
     assert(mhDC);
     // swap the bytes
     union TtfTag {