diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 14:52:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 08:01:35 +0200 |
| commit | afc3f660cb6b9f48bed24e9ee636ffe4d202f47b (patch) | |
| tree | aa0a69d03bade05db641175ccdd3df7874f11ca8 /sd | |
| parent | sd: boost::ptr_vector->std::vector (diff) | |
| download | core-afc3f660cb6b9f48bed24e9ee636ffe4d202f47b.tar.gz core-afc3f660cb6b9f48bed24e9ee636ffe4d202f47b.zip | |
sd: boost::ptr_vector->std::vector
Change-Id: I8eb4327163f7b3b5b8f88e93719fb7b15f31e7fd
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptbase.hxx | 5 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 77c5d5220d04..0297cf5a9346 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTBASE_HXX #include <vector> -#include <boost/ptr_container/ptr_vector.hpp> #include <vcl/mapmod.hxx> #include <tools/stream.hxx> @@ -144,7 +143,7 @@ struct FontCollectionEntry sal_Int16 CharSet; OUString Original; - bool bIsConverted; + bool bIsConverted; FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) : Scaling ( 1.0 ), @@ -195,7 +194,7 @@ public: private: VclPtr<VirtualDevice> pVDev; - boost::ptr_vector<FontCollectionEntry> maFonts; + std::vector<FontCollectionEntry> maFonts; }; #define PPTEX_STYLESHEETENTRYS 9 diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 6bc7dfd1b878..b831e91a008a 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1431,7 +1431,7 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry ) rEntry.Scaling = fScaling; } - maFonts.push_back(new FontCollectionEntry(rEntry)); + maFonts.push_back(rEntry); return nFonts; } return 0; |