diff options
| author | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-25 16:44:02 +0100 |
|---|---|---|
| committer | Nigel Hawkins <n.hawkins@gmx.com> | 2011-07-25 16:44:54 +0100 |
| commit | d5eda4db050c7f823597ca89281251ea4217b60d (patch) | |
| tree | db960773bd8c5047933ba90e201e08ffeb10d3fd | |
| parent | e93e5e29e919ace0a63df0f92c2afe765e467c31 (diff) | |
Replace SvUShorts with vector in layhelp.hxx and laycache.cxx
| -rw-r--r-- | sw/source/core/layout/laycache.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/layhelp.hxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 5745fa8c12..03c6515355 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -102,7 +102,7 @@ void SwLayoutCache::Read( SvStream &rStream ) void SwLayCacheImpl::Insert( sal_uInt16 nType, sal_uLong nIndex, xub_StrLen nOffset ) { - aType.Insert( nType, aType.Count() ); + aType.push_back( nType ); std::vector<sal_uLong>::push_back( nIndex ); aOffset.push_back( nOffset ); } diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 88257362bb..ad0da71993 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -28,7 +28,6 @@ #ifndef _LAYHELP_HXX #define _LAYHELP_HXX #ifndef _SVSTDARR_HXX -#define _SVSTDARR_USHORTS #define _SVSTDARR_XUB_STRLEN #include <svl/svstdarr.hxx> #endif @@ -65,13 +64,13 @@ SV_DECL_PTRARR_DEL( SwPageFlyCache, SwFlyCachePtr, 0, 4 ) class SwLayCacheImpl : public std::vector<sal_uLong> { SvXub_StrLens aOffset; - SvUShorts aType; + std::vector<sal_uInt16> aType; SwPageFlyCache aFlyCache; sal_Bool bUseFlyCache; void Insert( sal_uInt16 nType, sal_uLong nIndex, xub_StrLen nOffset ); public: - SwLayCacheImpl() : aType( 20, 10 ) {} + SwLayCacheImpl() {} sal_Bool Read( SvStream& rStream ); sal_uLong GetBreakIndex( sal_uInt16 nIdx ) const { return std::vector<sal_uLong>::operator[]( nIdx ); } |