summaryrefslogtreecommitdiff
path: root/sw/inc/modcfg.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-29 22:39:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-29 23:09:38 +0100
commitdc89ef154f076e7578f82d67cc4c4ef7f4101fe0 (patch)
treee53803515091f2fc10e9a9a6adc804423a014ff3 /sw/inc/modcfg.hxx
parent3638561bef4558102f5b5e8f6f9004d8da787f8d (diff)
Convert InsCaptionOptArr to boost::ptr_vector
I can't see any reason to keep these sorted, there are only two operations used, Insert and Find, and neither makes any use of the sort order. Change-Id: Iac3c327084dfdb83c0065a4a1786ac1f6b6b387e
Diffstat (limited to 'sw/inc/modcfg.hxx')
-rw-r--r--sw/inc/modcfg.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 37bcc839aca7..22590e8088c9 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -28,10 +28,10 @@
#ifndef _MODOPT_HXX
#define _MODOPT_HXX
+#include <boost/ptr_container/ptr_vector.hpp>
#include <tools/string.hxx>
#include <tools/wintypes.hxx>
#include <vcl/field.hxx>
-#include <svl/svarray.hxx>
#include <unotools/configitem.hxx>
#include "swdllapi.h"
#include "authratr.hxx"
@@ -43,15 +43,15 @@
class SwModuleOptions;
class InsCaptionOpt;
-typedef InsCaptionOpt* InsCaptionOptPtr;
-SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0)
-class InsCaptionOptArr : public InsCapOptArr
+class InsCaptionOptArr
{
- friend class SwModuleOptions;
- friend class SwInsertConfig;
-protected:
- InsCaptionOpt* Find(const SwCapObjType eType, const SvGlobalName *pOleId = 0) const;
+private:
+ typedef boost::ptr_vector<InsCaptionOpt> InsCapOptArr;
+ InsCapOptArr m_aInsCapOptArr;
+public:
+ InsCaptionOpt* Find(const SwCapObjType eType, const SvGlobalName *pOleId = 0);
+ void Insert(InsCaptionOpt* pObj);
};
class SwRevisionConfig : public utl::ConfigItem