summaryrefslogtreecommitdiff
path: root/sw/source/core/SwNumberTree
diff options
context:
space:
mode:
authorNigel Hawkins <n.hawkins@gmx.com>2011-06-10 15:46:15 +0100
committerNigel Hawkins <n.hawkins@gmx.com>2011-06-14 13:04:35 +0100
commit2bd75a4cac0ecd1275c30e8b3a952bb7555e2b1b (patch)
treeed8c23beba295dbe29e4406d40c5afc95b573c1c /sw/source/core/SwNumberTree
parent48774453b1d2caf427cb0742dc492194a8615941 (diff)
Replace SvUShortsSort with std::set<sal_uInt16> in SwDoc::ResetAttrs.
This change cascades through to a lot of other files. LGPLv3+/MPL.
Diffstat (limited to 'sw/source/core/SwNumberTree')
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index c0e52c1d97bc..23750b4c0530 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -372,16 +372,16 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
{
pTxtNode->RemoveFromList();
// --> clear all list attributes and the list style
- SvUShortsSort aResetAttrsArray;
- aResetAttrsArray.Insert( RES_PARATR_LIST_ID );
- aResetAttrsArray.Insert( RES_PARATR_LIST_LEVEL );
- aResetAttrsArray.Insert( RES_PARATR_LIST_ISRESTART );
- aResetAttrsArray.Insert( RES_PARATR_LIST_RESTARTVALUE );
- aResetAttrsArray.Insert( RES_PARATR_LIST_ISCOUNTED );
- aResetAttrsArray.Insert( RES_PARATR_NUMRULE );
+ std::set<sal_uInt16> aResetAttrsArray;
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ID );
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_LEVEL );
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISRESTART );
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_RESTARTVALUE );
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISCOUNTED );
+ aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_NUMRULE );
SwPaM aPam( *pTxtNode );
pTxtNode->GetDoc()->ResetAttrs( aPam, sal_False,
- &aResetAttrsArray,
+ aResetAttrsArray,
false );
}
}