Kaydet (Commit) 30b36766 authored tarafından melikeyurtoglu's avatar melikeyurtoglu Kaydeden (comit) Miklos Vajna

tdf#94879 add 'm' suffixes to member variables

Reviewed on:
	https://gerrit.libreoffice.org/19290

Change-Id: I48b0488edc9462ec1c15188d0b5c893db529c0e7
üst c18dc237
...@@ -866,8 +866,8 @@ bool StgDirStrm::Store() ...@@ -866,8 +866,8 @@ bool StgDirStrm::Store()
sal_Int32 nOldStart = nStart; // save for later deletion sal_Int32 nOldStart = nStart; // save for later deletion
sal_Int32 nOldSize = nSize; sal_Int32 nOldSize = nSize;
nStart = nPage = STG_EOF; nStart = nPage = STG_EOF;
nSize = nPos = 0; nSize = m_nPos = 0;
nOffset = 0; m_nOffset = 0;
// Delete all temporary entries // Delete all temporary entries
m_pRoot->DelTemp( false ); m_pRoot->DelTemp( false );
// set the entry numbers // set the entry numbers
...@@ -906,7 +906,7 @@ bool StgDirStrm::Store() ...@@ -906,7 +906,7 @@ bool StgDirStrm::Store()
aEmpty.Store( p ); aEmpty.Store( p );
} }
// Now we can release the old stream // Now we can release the old stream
pFat->FreePages( nOldStart, true ); m_pFat->FreePages( nOldStart, true );
rIo.m_aHdr.SetTOCStart( nStart ); rIo.m_aHdr.SetTOCStart( nStart );
return true; return true;
} }
......
This diff is collapsed.
...@@ -62,13 +62,13 @@ public: ...@@ -62,13 +62,13 @@ public:
class StgStrm { // base class for all streams class StgStrm { // base class for all streams
protected: protected:
StgIo& rIo; // I/O system StgIo& rIo; // I/O system
StgFAT* pFat; // FAT stream for allocations StgFAT* m_pFat; // FAT stream for allocations
StgDirEntry* pEntry; // dir entry (for ownership) StgDirEntry* pEntry; // dir entry (for ownership)
sal_Int32 nStart; // 1st data page sal_Int32 nStart; // 1st data page
sal_Int32 nSize; // stream size in bytes sal_Int32 nSize; // stream size in bytes
sal_Int32 nPos; // current byte position sal_Int32 m_nPos; // current byte position
sal_Int32 nPage; // current logical page sal_Int32 nPage; // current logical page
short nOffset; // offset into current page short m_nOffset; // offset into current page
short nPageSize; // logical page size short nPageSize; // logical page size
std::vector<sal_Int32> m_aPagesCache; std::vector<sal_Int32> m_aPagesCache;
void scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize = NULL); void scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize = NULL);
...@@ -77,12 +77,12 @@ protected: ...@@ -77,12 +77,12 @@ protected:
public: public:
virtual ~StgStrm(); virtual ~StgStrm();
StgIo& GetIo() { return rIo; } StgIo& GetIo() { return rIo; }
sal_Int32 GetPos() const { return nPos; } sal_Int32 GetPos() const { return m_nPos; }
sal_Int32 GetStart() const { return nStart; } sal_Int32 GetStart() const { return nStart; }
sal_Int32 GetSize() const { return nSize; } sal_Int32 GetSize() const { return nSize; }
sal_Int32 GetPage() const { return nPage; } sal_Int32 GetPage() const { return nPage; }
sal_Int32 GetPages() const { return ( nSize + nPageSize - 1 ) / nPageSize;} sal_Int32 GetPages() const { return ( nSize + nPageSize - 1 ) / nPageSize;}
short GetOffset() const { return nOffset;} short GetOffset() const { return m_nOffset;}
void SetEntry( StgDirEntry& ); void SetEntry( StgDirEntry& );
virtual bool SetSize( sal_Int32 ); virtual bool SetSize( sal_Int32 );
virtual bool Pos2Page( sal_Int32 nBytePos ); virtual bool Pos2Page( sal_Int32 nBytePos );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment