summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-21 14:54:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-21 14:58:36 +0100
commit2457f8f5b88028d0248943e2f80fce55913312f1 (patch)
tree018663cb3453328d89ff3f87e0a229757bf0407e /sw
parent1f98094fc61f39f349c7d6cd3f59a8c9cd0626fc (diff)
clarify DelNumRule comment
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx25
1 files changed, 12 insertions, 13 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f909f77875b9..357119b76a1b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1411,9 +1411,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
WW8ListManager::~WW8ListManager()
{
/*
- named lists remain in doc!!!
- unnamed lists are deleted when unused
- pLFOInfos are in any case destructed
+ named lists remain in document
+ unused automatic lists are removed from document (DelNumRule)
*/
for(std::vector<WW8LSTInfo *>::iterator aIter = maLSTInfos.begin();
aIter != maLSTInfos.end(); ++aIter)
@@ -1426,18 +1425,18 @@ WW8ListManager::~WW8ListManager()
delete *aIter;
}
boost::ptr_vector<WW8LFOInfo >::reverse_iterator aIter;
- for (aIter = pLFOInfos.rbegin() ;
- aIter < pLFOInfos.rend();
- ++aIter )
+ for (aIter = pLFOInfos.rbegin() ;
+ aIter < pLFOInfos.rend();
+ ++aIter )
+ {
+ if (aIter->bOverride
+ && aIter->pNumRule
+ && !aIter->bUsedInDoc
+ && aIter->pNumRule->IsAutoRule())
{
- if (aIter->bOverride
- && aIter->pNumRule
- && !aIter->bUsedInDoc
- && aIter->pNumRule->IsAutoRule())
- {
- rDoc.DelNumRule( aIter->pNumRule->GetName() );
- }
+ rDoc.DelNumRule( aIter->pNumRule->GetName() );
}
+ }
}
bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)