sw: enable some SwNumberTree sanity testing code

__SW_NUMBER_TREE_SANITY_CHECK isn't defined anywhere.

Change-Id: Ieb8c47d12c47a8a1ffcad0616382e4d2b55024a0

sw/inc/SwNumberTree.hxx

@@ -337,7 +337,7 @@ public:
     */
     const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
+#ifdef DBG_UTIL
     /**
        Sanity check.
 
@@ -347,7 +347,7 @@ public:
        @retval false  else
      */
     bool IsSane(bool bRecursive) const;
-#endif // __SW_NUMBER_TREE_SANITY_CHECK
+#endif // DBG_UTIL
 
 protected:
     /**
@@ -390,7 +390,7 @@ protected:
     // method called after this tree node has been removed from the list tree
     virtual void PostRemove() = 0;
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
+#ifdef DBG_UTIL
     /**
        Sanity check with loop detection.
 
@@ -401,7 +401,7 @@ protected:
        @retval false    else     */
     virtual bool IsSane
     (bool bRecursive, std::vector<const SwNumberTreeNode *> rParents) const;
-#endif // __SW_NUMBER_TREE_SANITY_CHECK
+#endif // DBG_UTIL
 
     /**
        the parent node

sw/source/core/SwNumberTree/SwNumberTree.cxx

@@ -21,6 +21,7 @@
 #include <functional>
 #include <SwNumberTree.hxx>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 
 using std::vector;
 using std::find;
@@ -383,9 +384,8 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
         }
     }
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
-    if (! IsSane(false) || ! IsSane(&_rDestNode))
-        clog << __FUNCTION__ << "insanity!" << endl;
+#ifdef DBG_UTIL
+    SAL_WARN_IF(!IsSane(false) || !_rDestNode.IsSane(true), "sw.core", "insanity");
 #endif
 }
 
@@ -432,7 +432,7 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
 
    OSL_ENSURE(mChildren.empty(), "MoveChildren failed!");
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
+#ifdef DBG_UTIL
     OSL_ENSURE(IsSane(false) && pDest->IsSane(false), "insanity!");
 #endif
 }
@@ -584,9 +584,8 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
         }
     }
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
-    if (! IsSane(false))
-        clog << __FUNCTION__ << ": insanity!" << endl;
+#ifdef DBG_UTIL
+    SAL_WARN_IF(!IsSane(false), "sw.core", "insanity");
 #endif
 }
 
@@ -678,9 +677,8 @@ void SwNumberTreeNode::RemoveMe()
         if (pSavedParent)
             pSavedParent->ClearObsoletePhantoms();
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
-        if (! IsSane(false))
-            clog << __FUNCTION__ << ": insanity!" << endl;
+#ifdef DBG_UTIL
+        SAL_WARN_IF(!IsSane(false), "sw.core", "insanity");
 #endif
     }
 }
@@ -858,7 +856,7 @@ SwNumberTreeNode::GetChildCount() const
     return mChildren.size();
 }
 
-#ifdef __SW_NUMBER_TREE_SANITY_CHECK
+#ifdef DBG_UTIL
 bool SwNumberTreeNode::IsSane(bool bRecursive) const
 {
     vector<const SwNumberTreeNode*> aParents;
@@ -941,7 +939,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
 
     return bResult;
 }
-#endif // __SW_NUMBER_TREE_SANITY_CHECK
+#endif // DBG_UTIL
 
 SwNumberTreeNode::tSwNumberTreeChildren::const_iterator
 SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const