diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 21:57:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-09 08:05:50 +0200 |
| commit | cffc1d5fde23213d115d02f58e8250f6a3f705c4 (patch) | |
| tree | c4d25cd1e2d54ef779cd9759e0044cb640a0f30e /sot | |
| parent | e44a0d23c658c1e34ae3d57e64fee6181cb2cf8b (diff) | |
sot: prefix members of StgInternalStream
Change-Id: Ie4fe557fc006414d119b64bb8d591f312a1f1f3d
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgole.cxx | 26 | ||||
| -rw-r--r-- | sot/source/sdstor/stgole.hxx | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index ae84be6d689f..9cd17987e9aa 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -36,7 +36,7 @@ StgInternalStream::StgInternalStream( BaseStorage& rStg, const OUString& rName, StreamMode nMode = bWr ? StreamMode::WRITE | StreamMode::SHARE_DENYALL : StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE; - pStrm = rStg.OpenStream( rName, nMode ); + m_pStrm = rStg.OpenStream( rName, nMode ); // set the error code right here in the stream SetError( rStg.GetError() ); @@ -45,15 +45,15 @@ StgInternalStream::StgInternalStream( BaseStorage& rStg, const OUString& rName, StgInternalStream::~StgInternalStream() { - delete pStrm; + delete m_pStrm; } sal_uLong StgInternalStream::GetData( void* pData, sal_uLong nSize ) { - if( pStrm ) + if( m_pStrm ) { - nSize = pStrm->Read( pData, nSize ); - SetError( pStrm->GetError() ); + nSize = m_pStrm->Read( pData, nSize ); + SetError( m_pStrm->GetError() ); return nSize; } else @@ -62,10 +62,10 @@ sal_uLong StgInternalStream::GetData( void* pData, sal_uLong nSize ) sal_uLong StgInternalStream::PutData( const void* pData, sal_uLong nSize ) { - if( pStrm ) + if( m_pStrm ) { - nSize = pStrm->Write( pData, nSize ); - SetError( pStrm->GetError() ); + nSize = m_pStrm->Write( pData, nSize ); + SetError( m_pStrm->GetError() ); return nSize; } else @@ -74,22 +74,22 @@ sal_uLong StgInternalStream::PutData( const void* pData, sal_uLong nSize ) sal_uInt64 StgInternalStream::SeekPos(sal_uInt64 const nPos) { - return pStrm ? pStrm->Seek( nPos ) : 0; + return m_pStrm ? m_pStrm->Seek( nPos ) : 0; } void StgInternalStream::FlushData() { - if( pStrm ) + if( m_pStrm ) { - pStrm->Flush(); - SetError( pStrm->GetError() ); + m_pStrm->Flush(); + SetError( m_pStrm->GetError() ); } } void StgInternalStream::Commit() { Flush(); - pStrm->Commit(); + m_pStrm->Commit(); } ///////////////////////// class StgCompObjStream diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 6bd89147b97d..a34dbb2a52c6 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -27,7 +27,7 @@ class StgInternalStream : public SvStream { - BaseStorageStream* pStrm; + BaseStorageStream* m_pStrm; virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE; virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; |