summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/SwNumberTree.hxx6
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx38
-rw-r--r--sw/source/core/unocore/unochart.cxx8
4 files changed, 27 insertions, 27 deletions
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index c31404136071..f57103fc4ada 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -448,7 +448,7 @@ protected:
than or equal to the referenced child are valid. All children
greater than the referenced child are invalid.
*/
- mutable tSwNumberTreeChildren::iterator mItLastValid;
+ mutable tSwNumberTreeChildren::const_iterator mItLastValid;
#if OSL_DEBUG_LEVEL > 1
/**
@@ -515,7 +515,7 @@ protected:
- false only set if aItLastValid is preceeding
the current last valid node
*/
- void SetLastValid(tSwNumberTreeChildren::iterator aItLastValid,
+ void SetLastValid(tSwNumberTreeChildren::const_iterator aItLastValid,
bool bValidating = false) const;
/**
@@ -672,7 +672,7 @@ protected:
*/
void ClearObsoletePhantoms();
- tSwNumberTreeChildren::iterator GetIterator(const SwNumberTreeNode * pChild) const;
+ tSwNumberTreeChildren::const_iterator GetIterator(const SwNumberTreeNode * pChild) const;
/**
Moves all children to a given destination node.
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 6505459d6c01..b831f4c1a991 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -211,7 +211,7 @@ bool SwNodeNum::HasCountedChildren() const
{
bool bResult = false;
- tSwNumberTreeChildren::iterator aIt;
+ tSwNumberTreeChildren::const_iterator aIt;
for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
{
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index a9c3f48048a7..1a939162c9a9 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -151,14 +151,14 @@ void SwNumberTreeNode::ClearObsoletePhantoms()
void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) const
{
- tSwNumberTreeChildren::iterator aValidateIt =
+ tSwNumberTreeChildren::const_iterator aValidateIt =
GetIterator(pNode);
if (aValidateIt != mChildren.end())
{
OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent");
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
// -->
// improvement:
@@ -196,7 +196,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
if ( !(*aIt)->IsRestart() &&
GetParent() && !bParentCounted )
{
- tSwNumberTreeChildren::iterator aParentChildIt =
+ tSwNumberTreeChildren::const_iterator aParentChildIt =
GetParent()->GetIterator( this );
while ( aParentChildIt != GetParent()->mChildren.begin() )
{
@@ -256,7 +256,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;
@@ -650,7 +650,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
return;
}
- tSwNumberTreeChildren::iterator aRemoveIt = GetIterator(pChild);
+ tSwNumberTreeChildren::const_iterator aRemoveIt = GetIterator(pChild);
if (aRemoveIt != mChildren.end())
{
@@ -658,7 +658,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
pRemove->mpParent = NULL;
- tSwNumberTreeChildren::iterator aItPred = mChildren.end();
+ tSwNumberTreeChildren::const_iterator aItPred = mChildren.end();
if (aRemoveIt == mChildren.begin())
{
@@ -829,7 +829,7 @@ bool SwNumberTreeNode::HasPhantomCountedParent() const
bool SwNumberTreeNode::IsFirst(const SwNumberTreeNode * pNode) const
{
- tSwNumberTreeChildren::iterator aIt = mChildren.begin();
+ tSwNumberTreeChildren::const_iterator aIt = mChildren.begin();
if ((*aIt)->IsPhantom())
++aIt;
@@ -999,10 +999,10 @@ 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));
OSL_ENSURE( aItResult != mChildren.end(),
@@ -1039,7 +1039,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())
{
@@ -1063,7 +1063,7 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
if (mpParent)
{
- tSwNumberTreeChildren::iterator aIt =
+ tSwNumberTreeChildren::const_iterator aIt =
mpParent->GetIterator(this);
if ( aIt == mpParent->mChildren.begin() )
@@ -1091,7 +1091,7 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
}
void SwNumberTreeNode::SetLastValid
- ( SwNumberTreeNode::tSwNumberTreeChildren::iterator aItValid,
+ ( SwNumberTreeNode::tSwNumberTreeChildren::const_iterator aItValid,
bool bValidating ) const
{
OSL_ENSURE( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
@@ -1108,7 +1108,7 @@ void SwNumberTreeNode::SetLastValid
// 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() )
@@ -1125,7 +1125,7 @@ void SwNumberTreeNode::SetLastValid
{
if (IsContinuous())
{
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
if (aIt != mChildren.end())
++aIt;
@@ -1148,7 +1148,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);
}
@@ -1159,7 +1159,7 @@ 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)
(*aIt)->InvalidateTree();
@@ -1169,7 +1169,7 @@ void SwNumberTreeNode::Invalidate(SwNumberTreeNode * pChild)
{
if (pChild->IsValid())
{
- tSwNumberTreeChildren::iterator aIt = GetIterator(pChild);
+ tSwNumberTreeChildren::const_iterator aIt = GetIterator(pChild);
if (aIt != mChildren.begin())
--aIt;
@@ -1211,7 +1211,7 @@ void SwNumberTreeNode::NotifyInvalidChildren()
{
if (IsNotifiable())
{
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
+ tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
if (aIt == mChildren.end())
aIt = mChildren.begin();
@@ -1227,7 +1227,7 @@ void SwNumberTreeNode::NotifyInvalidChildren()
// 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() )
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index b6b6cfb9b679..466878a1c98e 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1583,7 +1583,7 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
pTable->GetFrmFmt()->GetDoc()->GetChartControllerHelper().StartOrContinueLocking();
const Set_DataSequenceRef_t &rSet = aDataSequences[ pTable ];
- Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
+ Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
@@ -1662,8 +1662,8 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
//! would become invalid.
const Set_DataSequenceRef_t aSet( aDataSequences[ pTable ] );
- Set_DataSequenceRef_t::iterator aIt( aSet.begin() );
- Set_DataSequenceRef_t::iterator aEndIt( aSet.end() );
+ Set_DataSequenceRef_t::const_iterator aIt( aSet.begin() );
+ Set_DataSequenceRef_t::const_iterator aEndIt( aSet.end() );
while (aIt != aEndIt)
{
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
@@ -1736,7 +1736,7 @@ void SwChartDataProvider::AddRowCols(
// iterate over all data-sequences for the table
const Set_DataSequenceRef_t &rSet = aDataSequences[ &rTable ];
- Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
+ Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
generated by cgit (git 2.34.1) at 2025-03-01 18:28:16 +0000