diff options
| author | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-13 13:41:41 +0100 |
|---|---|---|
| committer | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-13 15:57:23 +0100 |
| commit | e1edf287ddca68fbc39b40dbb3d934fa6a858f1b (patch) | |
| tree | 21bbd0c748a1be22ea6861aa31fc99f115f03840 | |
| parent | 93b65a7bf07aedd042f38e6417753e88b397992c (diff) | |
Replace SvUShorts with vector in label.hxx and label1.cxx.
LGPLv3+/MPL
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/label.hxx | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index ad5ea2ac44..94f7153a0c 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -412,7 +412,7 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) aTypeBox.Clear(); aHiddenSortTypeBox.Clear(); - GetParent()->TypeIds().Remove( 0, GetParent()->TypeIds().Count() ); + GetParent()->TypeIds().clear(); const String aMake = aMakeBox.GetSelectEntry(); GetParent()->ReplaceGroup( aMake ); @@ -443,9 +443,9 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG ) } if(bInsert) { - GetParent()->TypeIds().Insert(i, GetParent()->TypeIds().Count()); + GetParent()->TypeIds().push_back(i); if ( !nLstType && aType == String(aItem.aLstType) ) - nLstType = GetParent()->TypeIds().Count(); + nLstType = GetParent()->TypeIds().size(); } } for(sal_uInt16 nEntry = 0; nEntry < aHiddenSortTypeBox.GetEntryCount(); nEntry++) diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 4f180627ca..9a330e712c 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.hxx @@ -30,12 +30,13 @@ #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR -#define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> #endif #include <sfx2/tabdlg.hxx> #include <com/sun/star/frame/XModel.hpp> #include <labelcfg.hxx> +#include <vector> + class SwLabRec; class SwLabRecs; class SwLabItem; @@ -49,7 +50,7 @@ class SwLabDlg : public SfxTabDialog SwNewDBMgr* pNewDBMgr; SwLabPrtPage* pPrtPage; - SvUShorts aTypeIds; + std::vector<sal_uInt16> aTypeIds; SvStringsDtor aMakes; SwLabRecs* pRecs; @@ -73,8 +74,8 @@ public: SwLabRecs &Recs() { return *pRecs; } const SwLabRecs &Recs() const { return *pRecs; } - SvUShorts &TypeIds() { return aTypeIds; } - const SvUShorts &TypeIds() const { return aTypeIds; } + std::vector<sal_uInt16> &TypeIds() { return aTypeIds; } + const std::vector<sal_uInt16> &TypeIds() const { return aTypeIds; } SvStringsDtor &Makes() { return aMakes; } const SvStringsDtor &Makes() const { return aMakes; } |