diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-03-01 23:21:02 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2016-03-01 23:51:05 +0100 |
| commit | f00967cf38ed0c2c197284391fc521825bb3c2ac (patch) | |
| tree | d1505cfff1707c51a74ece3091dcc25afbc5d778 /tools/source/ref | |
| parent | 4845155e0126571e4176819c5f27b76160146ce0 (diff) | |
sal_uIntPtr/sal_uLong to Index (aka sal_uInt32) in UniqueIndex
Change-Id: I212cb3bb9d920741629fc4564bbd28b393e8fe00
Diffstat (limited to 'tools/source/ref')
| -rw-r--r-- | tools/source/ref/pstm.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 4e44784f7fba..47dc22e40949 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -51,7 +51,7 @@ SvCreateInstancePersist SvClassManager::Get( sal_Int32 nClassId ) (cf. <SvPersistStream::SetStream>). @see SvPersistStream::SetStream */ -SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream, sal_uInt32 nStartIdxP ) +SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream, Index nStartIdxP ) : rClassMgr( rMgr ) , pStm( pStream ) , aPUIdx( nStartIdxP ) @@ -135,7 +135,7 @@ void SvPersistStream::FlushData() { } -sal_uIntPtr SvPersistStream::GetIndex( SvPersistBase * pObj ) const +SvPersistStream::Index SvPersistStream::GetIndex( SvPersistBase * pObj ) const { PersistBaseMap::const_iterator it = aPTable.find( pObj ); if( it == aPTable.end() ) @@ -148,7 +148,7 @@ sal_uIntPtr SvPersistStream::GetIndex( SvPersistBase * pObj ) const return it->second; } -SvPersistBase * SvPersistStream::GetObject( sal_uIntPtr nIdx ) const +SvPersistBase * SvPersistStream::GetObject( Index nIdx ) const { if( nIdx >= nStartIdx ) return aPUIdx.Get( nIdx ); @@ -388,7 +388,7 @@ static void ReadId ( SvStream & rStm, sal_uInt8 & nHdr, - sal_uInt32 & nId, + SvPersistStream::Index & nId, sal_uInt16 & nClassId ) { @@ -441,7 +441,7 @@ SvPersistStream& SvPersistStream::WritePointer if( pObj ) { - sal_uIntPtr nId = GetIndex( pObj ); + Index nId = GetIndex( pObj ); if( nId ) nP |= P_ID; else @@ -468,7 +468,7 @@ void SvPersistStream::ReadObj ) { sal_uInt8 nHdr; - sal_uInt32 nId = 0; + Index nId = 0; sal_uInt16 nClassId; rpObj = nullptr; // specification: 0 in case of error @@ -512,7 +512,7 @@ void SvPersistStream::ReadObj if( bRegister ) { // insert into table - sal_uIntPtr nNewId = aPUIdx.Insert( rpObj ); + const Index nNewId = aPUIdx.Insert( rpObj ); // in order to restore state after saving aPTable[ rpObj ] = nNewId; DBG_ASSERT( !(nHdr & P_DBGUTIL) || nId == nNewId, |