sw: remove some debugging cruft

13 files changed, 9 insertions, 59 deletions

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 797bf293804b..d331a8b10152 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -364,11 +364,6 @@ protected:
     SwRect  aFrm;   //Absolute Dokumentposition und groesse des Frm
     SwRect  aPrt;   //Position der PrtArea rel zum Frm und groesse der PrtArea
 
-    sal_uInt16 bFlag01:         1;
-    sal_uInt16 bFlag02:         1;
-    sal_uInt16 bFlag03:         1;
-    sal_uInt16 bFlag04:         1;
-    sal_uInt16 bFlag05:         1;
     sal_uInt16 bReverse:        1; // Next line above/at the right side instead
                                // under/at the left side of the previous line.
     sal_uInt16 bInvalidR2L:     1;
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index df50676696fc..bfe318834ed7 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -103,10 +103,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
     bInfFtn ( sal_False ),
     bInfSct ( sal_False )
 {
-#if OSL_DEBUG_LEVEL > 1
-    bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
-#endif
-
     OSL_ENSURE( pMod, "Kein Frameformat uebergeben." );
     bInvalidR2L = bInvalidVert = 1;
     //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 2d9099f90370..3658ca7ab4c6 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -58,9 +58,6 @@
 #include "swfntcch.hxx"     // SwFontAccess
 #include "flyfrm.hxx"
 
-#if OSL_DEBUG_LEVEL > 1
-#include "txtpaint.hxx"
-#endif
 
 #define MIN_OFFSET_STEP 10
 
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 93cba310f3be..6d85b3bec94a 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -45,10 +45,7 @@
 #include "itrtxt.hxx"
 #include "txtfrm.hxx"
 #include "porfly.hxx"
-
-#if OSL_DEBUG_LEVEL > 1
-#include "txtfrm.hxx"      // GetFrmID,
-#endif
+#include "txtfrm.hxx"
 
 /*************************************************************************
  *                      SwTxtIter::CtorInitTxtIter()
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index e64d0ef2658e..43ecfc22537b 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -65,9 +65,6 @@ sal_Bool ChkChain( SwLinePortion *pStart )
 }
 #endif
 
-#if OSL_DEBUG_LEVEL > 1
-const sal_Char *GetPortionName( const MSHORT nType );
-#endif
 
 SwLinePortion::~SwLinePortion()
 {
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index f623df574fcd..31fceb3245f8 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -660,7 +660,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
         }
     }
 
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
     if( !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
@@ -2770,7 +2770,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
     {
         SwpHintsArray::Insert( pHint );
         CalcFlags();
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
         if( !rNode.GetDoc()->IsInReading() )
             CHECK;
 #endif
@@ -2862,7 +2862,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
         rNode.ModifyNotification( 0, &aHint );
     }
 
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
     if( !bNoHintAdjustMode && !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 0e4ff69259e4..d466bcc6d2db 100755
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -41,10 +41,6 @@
 
 #include <svx/svdoutl.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <svx/fmglob.hxx>
-#endif
-
 #include "fesh.hxx"
 #include "pagefrm.hxx"
 #include "rootfrm.hxx"
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 0f047c42ef64..266816671f04 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -145,11 +145,9 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
         pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, sal_False);
     }
     rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nCntnt);
-#if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode,
                              rRegion.End()->nNode, sal_True ),
-             "Attribut oder AEhnliches ueber Bereichs-Grenzen" );
-#endif
+             "atttribute or similar crosses section-boundaries" );
     if( bCheck )
         return CheckNodesRange( rRegion.Start()->nNode,
                                 rRegion.End()->nNode, sal_True );
@@ -433,11 +431,6 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
     }
 }
 
-#if OSL_DEBUG_LEVEL > 1
-extern sal_Bool CheckNodesRange( const SwNodeIndex& rStt,
-                    const SwNodeIndex& rEnd, sal_Bool bChkSection );
-#endif
-
 // IterateNumrulePiece() sucht von rTmpStart bis rEnd den ersten
 // fuer Numrules gueltigen Bereich heraus.
 //
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 9df11686221f..dfcfdb4cf630 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -249,14 +249,14 @@ void Ww1SingleSprmPBrc::Start(
     Ww1Shell& rOut, sal_uInt8,
     W1_BRC10* pBrc,
     sal_uInt16
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
     nSize
 #endif
     ,
     Ww1Manager& /*rMan*/,
     SvxBoxItem& aBox)
 {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
     OSL_ENSURE(sizeof(W1_BRC10) == nSize, "sizemissmatch");
 #endif
     if(pBrc->dxpSpaceGet())
@@ -446,14 +446,14 @@ void Ww1SingleSprmPFInTable::Start(
 
 void Ww1SingleSprmPFInTable::Stop(
     Ww1Shell&
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
     rOut
 #endif
     ,
     sal_uInt8, sal_uInt8*, sal_uInt16,
     Ww1Manager& /*rMan*/)
 {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
     OSL_ENSURE(rOut.IsInTable(), "");
 #endif
 }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 65dc01d350c0..b1a617f90baa 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2371,16 +2371,6 @@ void WW8Export::SectionBreaksAndFrames( const SwTxtNode& rNode )
         OutWW6FlyFrmsInCntnt( rNode );
 }
 
-#if OSL_DEBUG_LEVEL > 1
-struct SwNodeHash
-{
-    size_t operator()(SwNode * pNode) const { return reinterpret_cast<size_t>(pNode); }
-};
-
-typedef ::boost::unordered_set<SwNode *, SwNodeHash> SwNodeHashSet;
-typedef ::std::deque<SwNode *> SwNodeDeque;
-#endif
-
 void MSWordExportBase::WriteText()
 {
     while( pCurPam->GetPoint()->nNode < pCurPam->GetMark()->nNode ||
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3310e6f1bde6..bac663d4b059 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -29,10 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#if OSL_DEBUG_LEVEL > 1
-#include <cstdio>
-#endif
-
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index d8a5fb254566..fa8810fb3222 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -612,10 +612,6 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                             pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
                     }
                 }
-#if OSL_DEBUG_LEVEL > 0
-                else
-                    OSL_ENSURE( !this, "it won't do without Sw3Reader" );
-#endif
             }
             break;
 
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 9583155aca89..2ef9b023f343 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -52,9 +52,6 @@
 #include <crsskip.hxx>
 #include <wordcountdialog.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <pam.hxx>
-#endif
 
 namespace com { namespace sun { namespace star { namespace util {
     struct SearchOptions;