diff options
| author | Nigel Hawkins <n.hawkins@gmx.com> | 2011-06-10 15:46:15 +0100 |
|---|---|---|
| committer | Nigel Hawkins <n.hawkins@gmx.com> | 2011-06-14 13:04:35 +0100 |
| commit | 2bd75a4cac0ecd1275c30e8b3a952bb7555e2b1b (patch) | |
| tree | ed8c23beba295dbe29e4406d40c5afc95b573c1c /sw/source/core/inc/UndoAttribute.hxx | |
| parent | 48774453b1d2caf427cb0742dc492194a8615941 (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/inc/UndoAttribute.hxx')
| -rw-r--r-- | sw/source/core/inc/UndoAttribute.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index 24f01b0b3f6e..3566eb8687de 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -35,16 +35,13 @@ #ifndef _SVSTDARR_HXX #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS -#define _SVSTDARR_BOOLS -#define _SVSTDARR_BYTES -#define _SVSTDARR_USHORTSSORT #include <svl/svstdarr.hxx> #endif #include <svl/itemset.hxx> #include <swtypes.hxx> #include <calbck.hxx> - +#include <set> class SvxTabStopItem; class SwFmt; @@ -82,7 +79,7 @@ public: class SwUndoResetAttr : public SwUndo, private SwUndRng { const ::std::auto_ptr<SwHistory> m_pHistory; - SvUShortsSort m_Ids; + std::set<sal_uInt16> m_Ids; const sal_uInt16 m_nFormatId; // Format-Id for Redo public: @@ -95,7 +92,7 @@ public: virtual void RedoImpl( ::sw::UndoRedoContext & ); virtual void RepeatImpl( ::sw::RepeatContext & ); - void SetAttrs( const SvUShortsSort& rArr ); + void SetAttrs( const std::set<sal_uInt16> &rAttrs ); SwHistory& GetHistory() { return *m_pHistory; } |