diff options
author | Noel Grandin <noel@peralex.com> | 2012-05-22 10:54:29 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-05-25 00:17:06 +0200 |
commit | da9bf1ee2f712748dd94080fe8fc7fd90348d08f (patch) | |
tree | 4dc647ffa6977945180b41cde7016b3ee39c7a84 /sw/inc/doc.hxx | |
parent | 74dc44a67c556462185f969f694ef2d3df1f893e (diff) |
Convert SV_DECL_PTRARR_DEL(SwPageDescs) to std::vector
Change-Id: I2301c1f237b1b08926c80942f459ba6062ed457d
Diffstat (limited to 'sw/inc/doc.hxx')
-rw-r--r-- | sw/inc/doc.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 2552022aee12..a8c5c2e5450b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -240,8 +240,12 @@ namespace sfx2 { } // PageDescriptor-interface, Array because of inlines. -typedef SwPageDesc* SwPageDescPtr; -SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4 ) +class SwPageDescs : public std::vector<SwPageDesc*> +{ +public: + // the destructor will free all objects still in the vector + ~SwPageDescs(); +}; // forward declaration void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); @@ -1332,7 +1336,7 @@ public: sal_Int32 nDocPageCount ); // PageDescriptor interface. - sal_uInt16 GetPageDescCnt() const { return aPageDescs.Count(); } + sal_uInt16 GetPageDescCnt() const { return aPageDescs.size(); } const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *aPageDescs[i]; } SwPageDesc* FindPageDescByName( const String& rName, sal_uInt16* pPos = 0 ) const; |