strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace SvUShorts with vector in layhelp.hxx and laycache.cxx

Browse source
This commit is contained in:
Nigel Hawkins 2011-07-25 16:44:02 +01:00
parent 8532d5d39f
commit f7ee8949f2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/source/core/layout/laycache.cxx
View file

@ -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 );
}

5
sw/source/core/layout/layhelp.hxx
View file

@ -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 ); }