diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-07-06 13:21:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-06 23:29:42 +0200 |
| commit | a0dc0d3cc2cf64567eeebba73d308f6ad827d810 (patch) | |
| tree | ed8d9b5372bcd7fabbb7cf43ec7f7db8bb396380 /sw/source/core/SwNumberTree | |
| parent | 4a932d3b672029374a6ada000f115ad86d7bc523 (diff) | |
sw: enable some SwNumberTree sanity testing code
__SW_NUMBER_TREE_SANITY_CHECK isn't defined anywhere.
Change-Id: Ieb8c47d12c47a8a1ffcad0616382e4d2b55024a0
Diffstat (limited to 'sw/source/core/SwNumberTree')
| -rw-r--r-- | sw/source/core/SwNumberTree/SwNumberTree.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 69564bfb5416..f60f0c0a732b 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/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 |