diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 21:58:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:53 +0200 |
| commit | cef74993a96feae0dd7489a11dfdf062687c0868 (patch) | |
| tree | 74f773e0e8316104db3ac8d5f4615e3c3ea74b8f /include | |
| parent | 7c927b64fa42ea1b0ddf97ce6b6aa400f2e30d5b (diff) | |
svtools: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: Ib0b10305768d368585d80ad6163e9081a4d8cd28
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrltool.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index edda87f8c4f7..e66e2c2c6d2d 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -20,14 +20,16 @@ #ifndef INCLUDED_SVTOOLS_CTRLTOOL_HXX #define INCLUDED_SVTOOLS_CTRLTOOL_HXX -#include <boost/ptr_container/ptr_vector.hpp> - #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <vcl/metric.hxx> #include <tools/solar.h> +#include <vector> +#include <memory> + + class ImplFontListNameInfo; class OutputDevice; @@ -149,7 +151,7 @@ private: sal_IntPtr* mpSizeAry; VclPtr<OutputDevice> mpDev; VclPtr<OutputDevice> mpDev2; - boost::ptr_vector<ImplFontListNameInfo> maEntries; + std::vector<std::unique_ptr<ImplFontListNameInfo>> m_Entries; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const OUString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const OUString& rStr ) const; @@ -182,7 +184,7 @@ public: bool IsAvailable( const OUString& rName ) const; sal_uInt16 GetFontNameCount() const { - return (sal_uInt16)maEntries.size(); + return (sal_uInt16)m_Entries.size(); } const vcl::FontInfo& GetFontName( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const OUString& rName ) const; |