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 | a8bcc0d0a94d9e2c434643e35d509c700c733c77 (patch) | |
| tree | de4aef5e8b6cf92cebd9c864e9188b3363f82c72 /sw/source/ui/inc/label.hxx | |
| parent | dbdf79d67a126f3acc0cb9c9bf88241fd05840b6 (diff) | |
Replace SvUShorts with vector in label.hxx and label1.cxx.
LGPLv3+/MPL
Diffstat (limited to 'sw/source/ui/inc/label.hxx')
| -rw-r--r-- | sw/source/ui/inc/label.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 8a23e1e845ce..430d0e500fa7 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; } |