summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-05-21 17:01:56 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-25 00:17:06 +0200
commit74dc44a67c556462185f969f694ef2d3df1f893e (patch)
treef95f387ca4931678f92a526b9d4bb51e00a87742 /sw/inc
parent426389981c6eb4231c8889c65e848b615b290b3a (diff)
Convert SV_DECL_PTRARR_DEL(SwFldTypes) to std::vector
Change-Id: Ia1f52f25680d3f970aa4f7f60a8e5203326a6796
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/docary.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 9de2213e9148..2a8642229da0 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -50,8 +50,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
#include <swtypes.hxx>
#include <svl/svarray.hxx>
-typedef SwFieldType* SwFldTypePtr;
-
// PageDescriptor-interface
// typedef SwPageDesc * SwPageDescPtr;
// SV_DECL_PTRARR_DEL(SwPageDescs, SwPageDescPtr,1);
@@ -65,7 +63,12 @@ SV_DECL_PTRARR_DEL(SwSpzFrmFmts,SwFrmFmtPtr,0)
typedef SwCharFmt* SwCharFmtPtr;
SV_DECL_PTRARR_DEL(SwCharFmts,SwCharFmtPtr,4)
-SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES )
+class SwFldTypes : public std::vector<SwFieldType*> {
+public:
+ // the destructor will free all objects still in the vector
+ ~SwFldTypes();
+ sal_uInt16 GetPos(const SwFieldType* pFieldType) const;
+};
class SwTOXTypes : public std::vector<SwTOXType*> {
public: