diff options
author | Noel Grandin <noel@peralex.com> | 2012-05-10 15:07:32 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-05-14 19:49:14 +0200 |
commit | 0be2a98cc04ee26f605a6f6e7efbdee325560a91 (patch) | |
tree | 255ab0da65e5446216df1d2a21fb0831b369cc02 /sw/inc/authfld.hxx | |
parent | 21155b8739b1a90455e75b9b527c75e27390455c (diff) |
Convert V_DECL_PTRARR_DEL(SortKeyArr) to boost::ptr_vector
Removed the copy constructor because it was dangerous,
it could result in accessing an SwTOXSortKey object after it was released.
Removed the operator= because it was private, and no longer used.
Change-Id: Ifaf21cbbad5f8b9cabddcc3009e4ed776b1fdd71
Diffstat (limited to 'sw/inc/authfld.hxx')
-rw-r--r-- | sw/inc/authfld.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index e17e8239a1bf..cb859e351693 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -33,6 +33,7 @@ #include <toxe.hxx> #include <svl/svstdarr.hxx> #include <vector> +#include <boost/ptr_container/ptr_vector.hpp> class SwAuthDataArr; @@ -64,14 +65,14 @@ struct SwTOXSortKey }; class SwAuthorityField; -class SortKeyArr; +typedef boost::ptr_vector<SwTOXSortKey> SortKeyArr; class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType { SwDoc* m_pDoc; SwAuthDataArr* m_pDataArr; std::vector<long> m_SequArr; - SortKeyArr* m_pSortKeyArr; + SortKeyArr m_SortKeyArr; sal_Unicode m_cPrefix; sal_Unicode m_cSuffix; sal_Bool m_bIsSequence :1; @@ -79,15 +80,11 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType LanguageType m_eLanguage; String m_sSortAlgorithm; - // @@@ private copy assignment, but public copy ctor? @@@ - const SwAuthorityFieldType& operator=( const SwAuthorityFieldType& ); - protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); public: SwAuthorityFieldType(SwDoc* pDoc); - SwAuthorityFieldType( const SwAuthorityFieldType& ); ~SwAuthorityFieldType(); virtual SwFieldType* Copy() const; |