summaryrefslogtreecommitdiff
path: root/sw/source/core/SwNumberTree/SwNumberTree.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/SwNumberTree/SwNumberTree.cxx')
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx274
1 files changed, 86 insertions, 188 deletions
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 05c30aa97f5b..184f94c8273e 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,13 +31,12 @@
#include <algorithm>
#include <functional>
-#include <errhdl.hxx>
#include <SwNumberTree.hxx>
using std::vector;
using std::find;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::nInstances = 0;
#endif
@@ -44,15 +44,13 @@ SwNumberTreeNode::SwNumberTreeNode()
: mChildren(),
mpParent( 0 ),
mnNumber( 0 ),
- // --> OD 2008-11-26 #158694#
mbContinueingPreviousSubTree( false ),
- // <--
mbPhantom( false ),
mItLastValid()
{
mItLastValid = mChildren.end();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
mnSerial = nInstances;
nInstances++;
#endif
@@ -71,19 +69,19 @@ SwNumberTreeNode::~SwNumberTreeNode()
}
else
{
- ASSERT(false, "lost children!");
+ OSL_FAIL("lost children!");
}
}
- ASSERT( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
+ OSL_ENSURE( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
nInstances--;
#endif
mpParent = (SwNumberTreeNode *) 0xdeadbeef;
- ASSERT(mChildren.empty(), "children left!");
+ OSL_ENSURE(mChildren.empty(), "children left!");
}
SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
@@ -93,7 +91,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! mChildren.empty() &&
(*mChildren.begin())->IsPhantom())
{
- ASSERT(false, "phantom already present");
+ OSL_FAIL("phantom already present");
}
else
{
@@ -106,7 +104,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! aInsert.second)
{
- ASSERT(false, "insert of phantom failed!");
+ OSL_FAIL("insert of phantom failed!");
delete pNew;
pNew = NULL;
@@ -137,12 +135,11 @@ void SwNumberTreeNode::ClearObsoletePhantoms()
if ((*aIt)->mChildren.empty())
{
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aIt)> could destroy the element, which
// is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aIt>.
SetLastValid(mChildren.end());
- // <--
delete *aIt;
mChildren.erase(aIt);
@@ -152,16 +149,16 @@ void SwNumberTreeNode::ClearObsoletePhantoms()
void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) const
{
- tSwNumberTreeChildren::iterator aValidateIt =
+ tSwNumberTreeChildren::const_iterator aValidateIt =
GetIterator(pNode);
if (aValidateIt != mChildren.end())
{
- ASSERT((*aValidateIt)->mpParent == this, "wrong parent");
+ OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent");
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
- // --> OD 2005-10-19 #126009#
+ // -->
// improvement:
// - Only one time checked for <mChildren.end()>.
// - Less checks for each loop run.
@@ -171,32 +168,13 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
// of the previous node determines the start value for the following
// children loop, if all children have to be validated and the first
// one doesn't restart the counting.
-// tSwNumTreeNumber nTmpNumber = 0;
-// if (aIt != mChildren.end())
-// nTmpNumber = (*aIt)->mnNumber;
-// while (aIt != aValidateIt)
-// {
-// if (aIt == mChildren.end())
-// aIt = mChildren.begin();
-// else
-// {
-// aIt++;
-// if ((*aIt)->IsCounted())
-// nTmpNumber++;
-// }
-// if ((*aIt)->IsRestart() || aIt == mChildren.begin())
-// nTmpNumber = (*aIt)->GetStart();
-// (*aIt)->mnNumber = nTmpNumber;
-// }
SwNumberTree::tSwNumTreeNumber nTmpNumber( 0 );
if (aIt != mChildren.end())
nTmpNumber = (*aIt)->mnNumber;
else
{
aIt = mChildren.begin();
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = false;
- // <--
// determine default start value
// consider the case that the first child isn't counted.
@@ -210,15 +188,13 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
// determine special start value for the case that first child
// doesn't restart the numbering and the parent node isn't counted
// and isn't the first child.
- // --> OD 2005-10-27 #126009#
const bool bParentCounted( IsCounted() &&
( !IsPhantom() ||
HasPhantomCountedParent() ) );
- // <--
if ( !(*aIt)->IsRestart() &&
GetParent() && !bParentCounted )
{
- tSwNumberTreeChildren::iterator aParentChildIt =
+ tSwNumberTreeChildren::const_iterator aParentChildIt =
GetParent()->GetIterator( this );
while ( aParentChildIt != GetParent()->mChildren.begin() )
{
@@ -226,15 +202,11 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
SwNumberTreeNode* pPrevNode( *aParentChildIt );
if ( pPrevNode->GetChildCount() > 0 )
{
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = true;
- // <--
nTmpNumber = (*(pPrevNode->mChildren.rbegin()))->GetNumber();
- // --> OD 2005-10-27 #126009#
if ( (*aIt)->IsCounted() &&
( !(*aIt)->IsPhantom() ||
(*aIt)->HasPhantomCountedParent() ) )
- // <--
{
++nTmpNumber;
}
@@ -258,11 +230,9 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
while (aIt != aValidateIt)
{
++aIt;
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = false;
- // <--
- // --> OD 2005-10-19 #126009# - only for counted nodes the number
+ // --> only for counted nodes the number
// has to be adjusted, compared to the previous node.
// this condition is hold also for nodes, which restart the numbering.
if ( (*aIt)->IsCounted() )
@@ -272,11 +242,9 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
else
++nTmpNumber;
}
- // <--
(*aIt)->mnNumber = nTmpNumber;
}
- // <--
SetLastValid(aIt, true);
}
@@ -284,7 +252,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
{
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
SwNumberTree::tSwNumTreeNumber nTmpNumber = 0;
@@ -297,21 +265,20 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
nTmpNumber = GetStartValue();
}
else
- aIt++;
+ ++aIt;
if (aIt != mChildren.end())
{
SwNumberTreeNode * pPred = (*aIt)->GetPred();
- // --> OD 2006-04-21 #i64311#
+ // #i64311#
// correct consideration of phantoms
// correct consideration of restart at a number tree node
if ( pPred )
{
if ( !(*aIt)->IsCounted() )
- // --> OD 2006-05-12 #i65284#
+ // #i65284#
nTmpNumber = pPred->GetNumber( pPred->GetParent() != (*aIt)->GetParent() );
- // <--
else
{
if ( (*aIt)->IsRestart() )
@@ -332,18 +299,15 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
nTmpNumber = GetStartValue();
}
}
- // <--
(*aIt)->mnNumber = nTmpNumber;
}
}
while (aIt != mChildren.end() && *aIt != pNode);
- // --> OD 2008-05-21 #i74748# - applied patch from garnier_romain
+ // #i74748# - applied patch from garnier_romain
// number tree node has to be validated.
-// SetLastValid(aIt);
SetLastValid( aIt, true );
- // <--
}
void SwNumberTreeNode::Validate(const SwNumberTreeNode * pNode) const
@@ -370,7 +334,7 @@ void SwNumberTreeNode::ValidateTree()
{
tSwNumberTreeChildren::iterator aIt;
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
(*aIt)->ValidateTree();
}
}
@@ -403,8 +367,6 @@ SwNumberTreeNode * SwNumberTreeNode::GetFirstNonPhantomChild()
/** Moves all children of this node that are greater than a given node
to the destination node.
-
- OD 2005-10-14 #125991#
*/
void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
SwNumberTreeNode& _rDestNode )
@@ -428,26 +390,24 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
if (aItUpper != mChildren.end())
{
tSwNumberTreeChildren::iterator aIt;
- for (aIt = aItUpper; aIt != mChildren.end(); aIt++)
+ for (aIt = aItUpper; aIt != mChildren.end(); ++aIt)
(*aIt)->mpParent = &_rDestNode;
_rDestNode.mChildren.insert(aItUpper, mChildren.end());
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aItUpper, mChildren.end())> could destroy
// the element, which is referenced by <mItLastValid>, it's needed to
// adjust <mItLastValid> before erasing <aIt>.
SetLastValid( mChildren.end() );
- // <--
mChildren.erase(aItUpper, mChildren.end());
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
if ( !mChildren.empty() )
{
SetLastValid( --(mChildren.end()) );
}
- // <--
}
#ifdef __SW_NUMBER_TREE_SANITY_CHECK
@@ -463,12 +423,11 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
tSwNumberTreeChildren::iterator aItBegin = mChildren.begin();
SwNumberTreeNode * pMyFirst = *mChildren.begin();
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aItBegin)> could destroy the element,
// which is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aItBegin>.
SetLastValid(mChildren.end());
- // <--
if (pMyFirst->IsPhantom())
{
@@ -488,22 +447,20 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
}
tSwNumberTreeChildren::iterator aIt;
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
(*aIt)->mpParent = pDest;
pDest->mChildren.insert(mChildren.begin(), mChildren.end());
mChildren.clear();
- // --> OD 2006-03-08 #131436#
// <stl::set.clear()> destroys all existing iterators.
// Thus, <mItLastValid> is also destroyed and reset becomes necessary
mItLastValid = mChildren.end();
- // <--
}
- ASSERT (mChildren.empty(), "MoveChildren failed!");
+ OSL_ENSURE(mChildren.empty(), "MoveChildren failed!");
#ifdef __SW_NUMBER_TREE_SANITY_CHECK
- ASSERT(IsSane(false) && pDest->IsSane(false), "insanity!");
+ OSL_ENSURE(IsSane(false) && pDest->IsSane(false), "insanity!");
#endif
}
@@ -535,18 +492,15 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
*/
- // --> OD 2008-03-13 #refactorlists#
if ( nDepth < 0 )
{
- ASSERT( false,
- "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
return;
}
- // <--
if ( pChild->GetParent() != NULL || pChild->GetChildCount() > 0 )
{
- ASSERT(false, "only orphans allowed.");
+ OSL_FAIL("only orphans allowed.");
return;
}
@@ -555,7 +509,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
tSwNumberTreeChildren::iterator aInsertDeepIt =
mChildren.upper_bound(pChild);
- ASSERT(! (aInsertDeepIt != mChildren.end() &&
+ OSL_ENSURE(! (aInsertDeepIt != mChildren.end() &&
(*aInsertDeepIt)->IsPhantom()), " unexspected phantom");
@@ -570,16 +524,14 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
}
else
{
- aInsertDeepIt--;
+ --aInsertDeepIt;
(*aInsertDeepIt)->AddChild(pChild, nDepth - 1);
}
}
else
{
- // --> OD 2008-02-19 #refactorlists#
pChild->PreAdd();
- // <--
std::pair<tSwNumberTreeChildren::iterator, bool> aResult =
mChildren.insert(pChild);
@@ -592,9 +544,9 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
if (aInsertedIt != mChildren.begin())
{
tSwNumberTreeChildren::iterator aPredIt = aInsertedIt;
- aPredIt--;
+ --aPredIt;
- // --> OD 2005-10-14 #125991#
+ // -->
// Move greater children of previous node to new child.
// This has to be done recursively on the children levels.
// Initialize loop variables <pPrevChildNode> and <pDestNode>
@@ -637,7 +589,6 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
}
// assure that unnessary created phantoms at <pChild> are deleted.
pChild->ClearObsoletePhantoms();
- // <--
if ((*aPredIt)->IsValid())
SetLastValid(aPredIt);
@@ -649,14 +600,13 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
if( bNotification )
{
- // --> OD 2005-10-20 #126009# - invalidation of not counted parent
+ // invalidation of not counted parent
// and notification of its siblings.
if ( !IsCounted() )
{
InvalidateMe();
NotifyInvalidSiblings();
}
- // <--
NotifyInvalidChildren();
}
}
@@ -683,12 +633,12 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
if (pChild->IsPhantom())
{
- ASSERT(false, "not applicable to phantoms!");
+ OSL_FAIL("not applicable to phantoms!");
return;
}
- tSwNumberTreeChildren::iterator aRemoveIt = GetIterator(pChild);
+ tSwNumberTreeChildren::const_iterator aRemoveIt = GetIterator(pChild);
if (aRemoveIt != mChildren.end())
{
@@ -696,7 +646,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
pRemove->mpParent = NULL;
- tSwNumberTreeChildren::iterator aItPred = mChildren.end();
+ tSwNumberTreeChildren::const_iterator aItPred = mChildren.end();
if (aRemoveIt == mChildren.begin())
{
@@ -710,20 +660,17 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
else
{
aItPred = aRemoveIt;
-
- aItPred--;
+ --aItPred;
}
if (! pRemove->mChildren.empty())
{
pRemove->MoveChildren(*aItPred);
- // --> OD 2008-04-04 #refactorlists#
(*aItPred)->InvalidateTree();
(*aItPred)->NotifyInvalidChildren();
- // <--
}
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aRemoveIt)> could destroy the element,
// which is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aRemoveIt>.
@@ -731,24 +678,17 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
SetLastValid(mChildren.end());
else
SetLastValid(aItPred);
- // <--
mChildren.erase(aRemoveIt);
- // --> OD 2008-04-04 #refactorlists#
-// if (aItPred != mChildren.end())
-// NotifyInvalidChildren();
NotifyInvalidChildren();
- // <--
}
else
{
- ASSERT(false, "RemoveChild: failed!");
+ OSL_FAIL("RemoveChild: failed!");
}
- // --> OD 2008-02-19 #refactorlists#
pChild->PostRemove();
- // <--
}
void SwNumberTreeNode::RemoveMe()
@@ -787,12 +727,10 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate)
return mnNumber;
}
-// --> OD 2008-11-26 #158694#
bool SwNumberTreeNode::IsContinueingPreviousSubTree() const
{
return mbContinueingPreviousSubTree;
}
-// <--
vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const
@@ -851,12 +789,11 @@ bool SwNumberTreeNode::IsCounted() const
( IsCountPhantoms() && HasCountedChildren() );
}
-// --> OD 2005-10-27 #126009#
bool SwNumberTreeNode::HasPhantomCountedParent() const
{
bool bRet( false );
- ASSERT( IsPhantom(),
+ OSL_ENSURE( IsPhantom(),
"<SwNumberTreeNode::HasPhantomCountedParent()> - wrong usage of method - it's only for phantoms" );
if ( IsPhantom() && mpParent )
{
@@ -876,14 +813,13 @@ bool SwNumberTreeNode::HasPhantomCountedParent() const
return bRet;
}
-// <--
bool SwNumberTreeNode::IsFirst(const SwNumberTreeNode * pNode) const
{
- tSwNumberTreeChildren::iterator aIt = mChildren.begin();
+ tSwNumberTreeChildren::const_iterator aIt = mChildren.begin();
if ((*aIt)->IsPhantom())
- aIt++;
+ ++aIt;
return *aIt == pNode;
}
@@ -909,7 +845,6 @@ bool SwNumberTreeNode::IsFirst() const
pNode = pNode->GetParent();
}
- // --> OD 2007-10-02 #b6600435#
// If node isn't the first child, it is the second child and the
// first child is a phanton. In this case check, if the first phantom
// child have only phanton childs
@@ -919,7 +854,6 @@ bool SwNumberTreeNode::IsFirst() const
{
bResult = false;
}
- // <--
}
else
bResult = false;
@@ -928,24 +862,22 @@ bool SwNumberTreeNode::IsFirst() const
return bResult;
}
-// --> OD 2008-03-13 #refactorlists#
void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
{
if ( nLevel < 0 )
{
- ASSERT( false,
- "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
+ OSL_FAIL( "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
return;
}
- ASSERT( GetParent(),
+ OSL_ENSURE( GetParent(),
"<SwNumberTreeNode::SetLevelInListTree(..)> - can only be called for number tree nodes in a list tree" );
if ( GetParent() )
{
if ( nLevel != GetLevelInListTree() )
{
SwNumberTreeNode* pRootTreeNode = GetRoot();
- ASSERT( pRootTreeNode,
+ OSL_ENSURE( pRootTreeNode,
"<SwNumberTreeNode::SetLevelInListTree(..)> - no root tree node found. Serious defect -> please inform OD." );
RemoveMe();
@@ -953,7 +885,6 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
}
}
}
-// <--
int SwNumberTreeNode::GetLevelInListTree() const
{
@@ -987,14 +918,14 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (find(rParents.begin(), rParents.end(), this) != rParents.end())
{
- ASSERT(false, " I'm my own ancestor!");
+ OSL_FAIL(" I'm my own ancestor!");
bResult = false;
}
if (! rParents.empty() && rParents.back() != mpParent)
{
- ASSERT(false, " I'm a bastard!");
+ OSL_FAIL(" I'm a bastard!");
bResult = false;
}
@@ -1002,7 +933,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
rParents.push_back(this);
bool bFirst = true;
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
{
if (*aIt)
{
@@ -1015,7 +946,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (! bFirst)
{
- ASSERT(false, " found phantom not at first position.");
+ OSL_FAIL(" found phantom not at first position.");
bResult = false;
}
@@ -1023,7 +954,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if ((*aIt)->mpParent != (SwNumberTreeNode *) this)
{
- ASSERT(false, "found a bastard");
+ OSL_FAIL("found a bastard");
bResult = false;
}
@@ -1032,7 +963,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
{
if (!(*aIt)->IsPhantom() && (*aIt)->LessThan(*this))
{
- ASSERT(false, " found child less than me");
+ OSL_FAIL(" found child less than me");
bResult = false;
}
@@ -1040,7 +971,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
}
else
{
- ASSERT(false, "found child that is NULL");
+ OSL_FAIL("found child that is NULL");
bResult = false;
}
@@ -1054,45 +985,19 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
}
#endif // __SW_NUMBER_TREE_SANITY_CHECK
-SwNumberTreeNode::tSwNumberTreeChildren::iterator
+SwNumberTreeNode::tSwNumberTreeChildren::const_iterator
SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
{
- tSwNumberTreeChildren::iterator aItResult =
+ tSwNumberTreeChildren::const_iterator aItResult =
mChildren.find(const_cast<SwNumberTreeNode *>(pChild));
- ASSERT( aItResult != mChildren.end(),
+ OSL_ENSURE( aItResult != mChildren.end(),
"something went wrong getting the iterator for a child");
return aItResult;
}
-//String SwNumberTreeNode::print(const String & rIndent,
-// const String & rMyIndent,
-// int nDepth) const
-//{
-// String aStr = rIndent;
-// aStr += ToString();
-// aStr += String("\n", RTL_TEXTENCODING_ASCII_US);
-
-// if (nDepth != 0)
-// {
-// if (nDepth < 0)
-// nDepth = -1;
-
-// tSwNumberTreeChildren::const_iterator aIt;
-// for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
-// {
-// String aTmpStr(rIndent);
-
-// aTmpStr += rMyIndent;
-// aStr += (*aIt)->print(aTmpStr, rMyIndent, nDepth - 1);
-// }
-// }
-
-// return aStr;
-//}
-
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::GetInstances()
{
return nInstances;
@@ -1120,7 +1025,7 @@ bool SwNumberTreeNodeLessThan(const SwNumberTreeNode * pA,
SwNumberTreeNode * SwNumberTreeNode::GetLastDescendant() const
{
SwNumberTreeNode * pResult = NULL;
- tSwNumberTreeChildren::reverse_iterator aIt = mChildren.rbegin();
+ tSwNumberTreeChildren::const_reverse_iterator aIt = mChildren.rbegin();
if (aIt != mChildren.rend())
{
@@ -1144,19 +1049,18 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
if (mpParent)
{
- tSwNumberTreeChildren::iterator aIt =
+ tSwNumberTreeChildren::const_iterator aIt =
mpParent->GetIterator(this);
if ( aIt == mpParent->mChildren.begin() )
{
- // --> OD 2006-04-24 #i64311#
+ // #i64311#
// root node is no valid predecessor
pResult = mpParent->GetParent() ? mpParent : NULL;
- // <--
}
else
{
- aIt--;
+ --aIt;
if ( !bSibling )
pResult = (*aIt)->GetLastDescendant();
@@ -1172,10 +1076,10 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
}
void SwNumberTreeNode::SetLastValid
- ( SwNumberTreeNode::tSwNumberTreeChildren::iterator aItValid,
+ ( SwNumberTreeNode::tSwNumberTreeChildren::const_iterator aItValid,
bool bValidating ) const
{
- ASSERT( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
+ OSL_ENSURE( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
"last-valid iterator");
if (
@@ -1186,11 +1090,10 @@ void SwNumberTreeNode::SetLastValid
)
{
mItLastValid = aItValid;
- // --> OD 2005-10-19 #126009# - invalidation of children of next not
- // counted is needed
+ // invalidation of children of next not counted is needed
if ( GetParent() )
{
- tSwNumberTreeChildren::iterator aParentChildIt =
+ tSwNumberTreeChildren::const_iterator aParentChildIt =
GetParent()->GetIterator( this );
++aParentChildIt;
if ( aParentChildIt != GetParent()->mChildren.end() )
@@ -1202,16 +1105,15 @@ void SwNumberTreeNode::SetLastValid
}
}
}
- // <--
}
{
if (IsContinuous())
{
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
if (aIt != mChildren.end())
- aIt++;
+ ++aIt;
else
aIt = mChildren.begin();
@@ -1219,7 +1121,7 @@ void SwNumberTreeNode::SetLastValid
{
(*aIt)->InvalidateTree();
- aIt++;
+ ++aIt;
}
SetLastValid(bValidating);
@@ -1231,7 +1133,7 @@ void SwNumberTreeNode::SetLastValid(bool bValidating) const
{
if (mpParent)
{
- tSwNumberTreeChildren::iterator aIt = mpParent->GetIterator(this);
+ tSwNumberTreeChildren::const_iterator aIt = mpParent->GetIterator(this);
mpParent->SetLastValid(aIt, bValidating);
}
@@ -1242,9 +1144,9 @@ void SwNumberTreeNode::InvalidateTree() const
// do not call SetInvalid, would cause loop !!!
mItLastValid = mChildren.end();
- tSwNumberTreeChildren::iterator aIt;
+ tSwNumberTreeChildren::const_iterator aIt;
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
(*aIt)->InvalidateTree();
}
@@ -1252,10 +1154,10 @@ void SwNumberTreeNode::Invalidate(SwNumberTreeNode * pChild)
{
if (pChild->IsValid())
{
- tSwNumberTreeChildren::iterator aIt = GetIterator(pChild);
+ tSwNumberTreeChildren::const_iterator aIt = GetIterator(pChild);
if (aIt != mChildren.begin())
- aIt--;
+ --aIt;
else
aIt = mChildren.end();
@@ -1285,7 +1187,7 @@ void SwNumberTreeNode::Notify()
tSwNumberTreeChildren::iterator aIt;
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+ for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
(*aIt)->Notify();
}
}
@@ -1294,24 +1196,23 @@ void SwNumberTreeNode::NotifyInvalidChildren()
{
if (IsNotifiable())
{
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
if (aIt == mChildren.end())
aIt = mChildren.begin();
else
- aIt++;
+ ++aIt;
while (aIt != mChildren.end())
{
(*aIt)->Notify();
- aIt++;
+ ++aIt;
}
- // --> OD 2005-10-19 #126009# - notification of next not counted node
- // is also needed.
+ // notification of next not counted node is also needed.
if ( GetParent() )
{
- tSwNumberTreeChildren::iterator aParentChildIt =
+ tSwNumberTreeChildren::const_iterator aParentChildIt =
GetParent()->GetIterator( this );
++aParentChildIt;
if ( aParentChildIt != GetParent()->mChildren.end() )
@@ -1324,7 +1225,6 @@ void SwNumberTreeNode::NotifyInvalidChildren()
}
}
- // <--
}
if (IsContinuous() && mpParent)
@@ -1337,7 +1237,7 @@ void SwNumberTreeNode::NotifyInvalidSiblings()
mpParent->NotifyInvalidChildren();
}
-// --> OD 2007-09-07 #i81002#
+// #i81002#
const SwNumberTreeNode* SwNumberTreeNode::GetPrecedingNodeOf(
const SwNumberTreeNode& rNode ) const
{
@@ -1368,15 +1268,12 @@ const SwNumberTreeNode* SwNumberTreeNode::GetPrecedingNodeOf(
return pPrecedingNode;
}
-// <--
-// --> OD 2008-04-17 #refactorlists#
void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
{
if ( nListLevel < 0 )
{
- ASSERT( false,
- "<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
+ OSL_FAIL( "<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
return;
}
@@ -1387,7 +1284,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
void SwNumberTreeNode::NotifyChildrenOnDepth( const int nDepth )
{
- ASSERT( nDepth >= 0,
+ OSL_ENSURE( nDepth >= 0,
"<SwNumberTreeNode::NotifyChildrenOnDepth(..)> - misusage" );
SwNumberTreeNode::tSwNumberTreeChildren::iterator aChildIter =
@@ -1406,4 +1303,5 @@ void SwNumberTreeNode::NotifyChildrenOnDepth( const int nDepth )
++aChildIter;
}
}
-// <--
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 22:12:46 +0000