diff options
| author | Noel Grandin <noel@peralex.com> | 2012-07-19 15:51:39 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-26 14:30:10 +0200 |
| commit | 6376dd83fb436f73cb891bc11b502014e66a74da (patch) | |
| tree | 67d938090919a0d43300f95d42a24bd722314abf /svx/inc/svx/srchdlg.hxx | |
| parent | ed24564ce11683731b820c29d5a46e073ab7a2a7 (diff) | |
Convert SV_DECL_VARARR_VISIBILITY(SrchAttrItemList) to std::vector
Change-Id: Ib6d6bb62613004ba0a8ee603f7047fb017570e89
Diffstat (limited to 'svx/inc/svx/srchdlg.hxx')
| -rw-r--r-- | svx/inc/svx/srchdlg.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index 7f0fa67c1bbb..6d032e6f49fb 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -38,10 +38,10 @@ #include <vcl/dialog.hxx> #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/svarray.hxx> #include <svtools/svmedit.hxx> #include <svl/srchdefs.hxx> #include "svx/svxdllapi.h" +#include <vector> class SvxSearchItem; class MoreButton; @@ -63,7 +63,7 @@ struct SearchAttrItem // class SearchAttrItemList ---------------------------------------------- -SV_DECL_VARARR_VISIBILITY(SrchAttrItemList, SearchAttrItem, 8, SVX_DLLPUBLIC) +typedef std::vector<SearchAttrItem> SrchAttrItemList; class SVX_DLLPUBLIC SearchAttrItemList : private SrchAttrItemList { @@ -75,15 +75,15 @@ public: void Put( const SfxItemSet& rSet ); SfxItemSet& Get( SfxItemSet& rSet ); void Clear(); - sal_uInt16 Count() const { return SrchAttrItemList::Count(); } - SearchAttrItem& operator[](sal_uInt16 nPos) const + sal_uInt16 Count() const { return SrchAttrItemList::size(); } + SearchAttrItem& operator[](sal_uInt16 nPos) + { return SrchAttrItemList::operator[]( nPos ); } + SearchAttrItem& GetObject( sal_uInt16 nPos ) { return SrchAttrItemList::operator[]( nPos ); } - SearchAttrItem& GetObject( sal_uInt16 nPos ) const - { return SrchAttrItemList::GetObject( nPos ); } - // the pointer to the item is not being copierd, so don't delete + // the pointer to the item is not being copied, so don't delete void Insert( const SearchAttrItem& rItem ) - { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); } + { SrchAttrItemList::push_back( rItem ); } // deletes the pointer to the items void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ); }; |