diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-08 21:55:46 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-09 08:05:49 +0200 |
| commit | 21aa14dcde323719c65d0ab685f746d1215ebc22 (patch) | |
| tree | 3250aa204b64527188b865affe5058ad3237b367 /sot | |
| parent | 6829819e1c7587ff00eaef710ec3cf24a892aa98 (diff) | |
sot: prefix members of StgSmallStrm
Change-Id: I809350c076f871398024a0d1c6de098b09782f9b
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgstrms.cxx | 18 | ||||
| -rw-r--r-- | sot/source/sdstor/stgstrms.hxx | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 8eb66913e099..f843c7fb248f 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1015,8 +1015,8 @@ void StgSmallStrm::Init( sal_Int32 nBgn, sal_Int32 nLen ) { if ( rIo.m_pDataFAT ) pFat = new StgFAT( *rIo.m_pDataFAT, false ); - pData = rIo.m_pDataStrm; - OSL_ENSURE( pFat && pData, "The pointers should not be empty!" ); + m_pData = rIo.m_pDataStrm; + OSL_ENSURE( pFat && m_pData, "The pointers should not be empty!" ); nPageSize = rIo.GetDataPageSize(); nStart = @@ -1042,10 +1042,10 @@ sal_Int32 StgSmallStrm::Read( void* pBuf, sal_Int32 n ) nBytes = (short) n; if( nBytes ) { - if( !pData || !pData->Pos2Page( nPage * nPageSize + nOffset ) ) + if( !m_pData || !m_pData->Pos2Page( nPage * nPageSize + nOffset ) ) break; // all reading through the stream - short nRes = (short) pData->Read( static_cast<sal_uInt8*>(pBuf) + nDone, nBytes ); + short nRes = (short) m_pData->Read( static_cast<sal_uInt8*>(pBuf) + nDone, nBytes ); nDone = nDone + nRes; nPos += nRes; n -= nRes; @@ -1082,13 +1082,13 @@ sal_Int32 StgSmallStrm::Write( const void* pBuf, sal_Int32 n ) { // all writing goes through the stream sal_Int32 nDataPos = nPage * nPageSize + nOffset; - if ( !pData - || ( pData->GetSize() < ( nDataPos + nBytes ) - && !pData->SetSize( nDataPos + nBytes ) ) ) + if ( !m_pData + || ( m_pData->GetSize() < ( nDataPos + nBytes ) + && !m_pData->SetSize( nDataPos + nBytes ) ) ) break; - if( !pData->Pos2Page( nDataPos ) ) + if( !m_pData->Pos2Page( nDataPos ) ) break; - short nRes = (short) pData->Write( static_cast<sal_uInt8 const *>(pBuf) + nDone, nBytes ); + short nRes = (short) m_pData->Write( static_cast<sal_uInt8 const *>(pBuf) + nDone, nBytes ); nDone = nDone + nRes; nPos += nRes; n -= nRes; diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index 61a33160f194..227029aee150 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -130,7 +130,7 @@ public: class StgSmallStrm : public StgStrm // a logical data stream { - StgStrm* pData; // the data stream + StgStrm* m_pData; // the data stream void Init( sal_Int32 nBgn, sal_Int32 nLen ); public: StgSmallStrm( StgIo&, sal_Int32 nBgn, sal_Int32 nLen ); |