diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-02 23:15:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-02 23:31:29 +0200 |
| commit | 64d0f4a53b749a581b5bf13919033f9bf6d5137a (patch) | |
| tree | d38d778e0005c3a77a91e6f2c2c89d79509592f6 /sw/source | |
| parent | b1c47274ecb01752863b8967e63f2ad7771928e9 (diff) | |
sw: replace boost::ptr_vector with std::vector
Change-Id: I46bdab6995676c89f353caa3b0cf359f3aa10151
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/laycache.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/layout/layhelp.hxx | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index fed24be3feef..889edfe798bd 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -130,8 +130,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream ) sal_uInt16 nPgNum(0); aIo.GetStream().ReadUInt16( nPgNum ).ReadUInt32( nIndex ) .ReadInt32( nX ).ReadInt32( nY ).ReadInt32( nW ).ReadInt32( nH ); - SwFlyCache* pFly = new SwFlyCache( nPgNum, nIndex, nX, nY, nW, nH ); - aFlyCache.push_back( pFly ); + m_FlyCache.push_back(SwFlyCache( nPgNum, nIndex, nX, nY, nW, nH )); aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY ); break; } diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index ddfdad91db89..00d2762cf737 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -22,8 +22,6 @@ #include <swrect.hxx> -#include <boost/ptr_container/ptr_vector.hpp> - #include <vector> #include <deque> @@ -50,19 +48,19 @@ class SvStream; */ class SwFlyCache; -typedef boost::ptr_vector<SwFlyCache> SwPageFlyCache; +typedef std::vector<SwFlyCache> SwPageFlyCache; class SwLayCacheImpl { std::vector<sal_uLong> mIndices; std::deque<sal_Int32> aOffset; std::vector<sal_uInt16> aType; - SwPageFlyCache aFlyCache; + SwPageFlyCache m_FlyCache; bool bUseFlyCache; void Insert( sal_uInt16 nType, sal_uLong nIndex, sal_Int32 nOffset ); public: - SwLayCacheImpl() : mIndices(), aOffset(), aType(), aFlyCache(), bUseFlyCache(false) {} + SwLayCacheImpl() : bUseFlyCache(false) {} size_t size() const { return mIndices.size(); } @@ -72,8 +70,8 @@ public: sal_Int32 GetBreakOfst( size_t nIdx ) const { return aOffset[ nIdx ]; } sal_uInt16 GetBreakType( sal_uInt16 nIdx ) const { return aType[ nIdx ]; } - size_t GetFlyCount() const { return aFlyCache.size(); } - SwFlyCache& GetFlyCache( size_t nIdx ) { return aFlyCache[ nIdx ]; } + size_t GetFlyCount() const { return m_FlyCache.size(); } + SwFlyCache& GetFlyCache( size_t nIdx ) { return m_FlyCache[ nIdx ]; } bool IsUseFlyCache() const { return bUseFlyCache; } }; |