Kaydet (Commit) fa2167fe authored tarafından Michael Stahl's avatar Michael Stahl

revert 25622f29 in list.cxx

To avoid conficts; TODO re-apply.

Change-Id: I697a943504857e41978f936d21beb038c4a0e010
üst c25d494b
...@@ -98,11 +98,14 @@ SwListImpl::SwListImpl( const OUString& sListId, ...@@ -98,11 +98,14 @@ SwListImpl::SwListImpl( const OUString& sListId,
SwListImpl::~SwListImpl() COVERITY_NOEXCEPT_FALSE SwListImpl::~SwListImpl() COVERITY_NOEXCEPT_FALSE
{ {
for ( auto& rNumberTree : maListTrees ) tListTrees::iterator aNumberTreeIter;
for ( aNumberTreeIter = maListTrees.begin();
aNumberTreeIter != maListTrees.end();
++aNumberTreeIter )
{ {
SwNodeNum::HandleNumberTreeRootNodeDelete( *(rNumberTree.first) ); SwNodeNum::HandleNumberTreeRootNodeDelete( *((*aNumberTreeIter).first) );
delete rNumberTree.first; delete (*aNumberTreeIter).first;
delete rNumberTree.second; delete (*aNumberTreeIter).second;
} }
} }
...@@ -113,16 +116,19 @@ void SwListImpl::InsertListItem( SwNodeNum& rNodeNum, ...@@ -113,16 +116,19 @@ void SwListImpl::InsertListItem( SwNodeNum& rNodeNum,
const SwPosition aPosOfNodeNum( rNodeNum.GetPosition() ); const SwPosition aPosOfNodeNum( rNodeNum.GetPosition() );
const SwNodes* pNodesOfNodeNum = &(aPosOfNodeNum.nNode.GetNode().GetNodes()); const SwNodes* pNodesOfNodeNum = &(aPosOfNodeNum.nNode.GetNode().GetNodes());
for ( const auto& rNumberTree : maListTrees ) tListTrees::const_iterator aNumberTreeIter;
for ( aNumberTreeIter = maListTrees.begin();
aNumberTreeIter != maListTrees.end();
++aNumberTreeIter )
{ {
const SwPosition* pStart = rNumberTree.second->Start(); const SwPosition* pStart = (*aNumberTreeIter).second->Start();
const SwPosition* pEnd = rNumberTree.second->End(); const SwPosition* pEnd = (*aNumberTreeIter).second->End();
const SwNodes* pRangeNodes = &(pStart->nNode.GetNode().GetNodes()); const SwNodes* pRangeNodes = &(pStart->nNode.GetNode().GetNodes());
if ( pRangeNodes == pNodesOfNodeNum && if ( pRangeNodes == pNodesOfNodeNum &&
*pStart <= aPosOfNodeNum && aPosOfNodeNum <= *pEnd) *pStart <= aPosOfNodeNum && aPosOfNodeNum <= *pEnd)
{ {
rNumberTree.first->AddChild( &rNodeNum, nLevel ); (*aNumberTreeIter).first->AddChild( &rNodeNum, nLevel );
break; break;
} }
...@@ -136,17 +142,23 @@ void SwListImpl::RemoveListItem( SwNodeNum& rNodeNum ) ...@@ -136,17 +142,23 @@ void SwListImpl::RemoveListItem( SwNodeNum& rNodeNum )
void SwListImpl::InvalidateListTree() void SwListImpl::InvalidateListTree()
{ {
for ( auto& rNumberTree : maListTrees ) tListTrees::iterator aNumberTreeIter;
for ( aNumberTreeIter = maListTrees.begin();
aNumberTreeIter != maListTrees.end();
++aNumberTreeIter )
{ {
rNumberTree.first->InvalidateTree(); (*aNumberTreeIter).first->InvalidateTree();
} }
} }
void SwListImpl::ValidateListTree() void SwListImpl::ValidateListTree()
{ {
for ( auto& rNumberTree : maListTrees ) tListTrees::iterator aNumberTreeIter;
for ( aNumberTreeIter = maListTrees.begin();
aNumberTreeIter != maListTrees.end();
++aNumberTreeIter )
{ {
rNumberTree.first->NotifyInvalidChildren(); (*aNumberTreeIter).first->NotifyInvalidChildren();
} }
} }
...@@ -188,9 +200,12 @@ bool SwListImpl::IsListLevelMarked( const int nListLevel ) const ...@@ -188,9 +200,12 @@ bool SwListImpl::IsListLevelMarked( const int nListLevel ) const
void SwListImpl::NotifyItemsOnListLevel( const int nLevel ) void SwListImpl::NotifyItemsOnListLevel( const int nLevel )
{ {
for ( auto& rNumberTree : maListTrees ) tListTrees::iterator aNumberTreeIter;
for ( aNumberTreeIter = maListTrees.begin();
aNumberTreeIter != maListTrees.end();
++aNumberTreeIter )
{ {
rNumberTree.first->NotifyNodesOnListLevel( nLevel ); (*aNumberTreeIter).first->NotifyNodesOnListLevel( nLevel );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment