diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 14:54:26 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 14:54:26 +0000 |
commit | 0a5ece6d12087496312fecc72a21e67b332372de (patch) | |
tree | 945fe4bf3bb9ce7e48829ed0dc44172982bea237 /sw/source/core/SwNumberTree | |
parent | 8643abc4807a1d6a12f449615fbaf1e557264436 (diff) |
INTEGRATION: CWS sw8u10bf05 (1.12.120); FILE MERGED
2008/02/25 08:28:41 od 1.12.120.2: RESYNC: (1.12-1.13); FILE MERGED
2008/01/25 10:40:46 ama 1.12.120.1: Fix #85182#: Remove unused functions
Diffstat (limited to 'sw/source/core/SwNumberTree')
-rw-r--r-- | sw/source/core/SwNumberTree/SwNumberTree.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 8d404ca03fa8..e2961ee8b970 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SwNumberTree.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2008-02-26 10:33:27 $ + * last change: $Author: vg $ $Date: 2008-03-18 15:54:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1043,7 +1043,8 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const tSwNumberTreeChildren::iterator aItResult = mChildren.find(const_cast<SwNumberTreeNode *>(pChild)); - ASSERT(pChild == *aItResult, "something went wrong getting the iterator for a child"); + ASSERT( aItResult != mChildren.end(), + "something went wrong getting the iterator for a child"); return aItResult; } @@ -1116,12 +1117,6 @@ bool SwNumberTreeNodeLessThan(const SwNumberTreeNode * pA, return bResult; } -bool SwNumberTreeNodeGreaterEqual(const SwNumberTreeNode * pA, - const SwNumberTreeNode * pB) -{ - return ! SwNumberTreeNodeLessThan(pA, pB); -} - SwNumberTreeNode * SwNumberTreeNode::GetLastDescendant() const { SwNumberTreeNode * pResult = NULL; |