summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:10:06 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:11:22 +0100
commit2e6327e4e8c35678a7a52b8b1a78c99caff1f73f (patch)
tree723ff49e2a2b122abb0835eb31faacd6afa1d2e5 /sw
parent37e0e10fd8335eb4b6d25e542cdf163020e8d452 (diff)
sw: prefix members of SwCacheObj
Change-Id: I416c43f5f6819029e279bc2f5fb696b59917ef06
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/bastyp/swcache.cxx18
-rw-r--r--sw/source/core/inc/swcache.hxx28
-rw-r--r--sw/source/core/layout/frmtool.cxx2
3 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 58e722b9fcf2..51817326ead7 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -422,11 +422,11 @@ void SwCache::SetLRUOfst( const sal_uInt16 nOfst )
}
SwCacheObj::SwCacheObj( const void *pOwn ) :
- pNext( 0 ),
- pPrev( 0 ),
- nCachePos( USHRT_MAX ),
- nLock( 0 ),
- pOwner( pOwn )
+ m_pNext( 0 ),
+ m_pPrev( 0 ),
+ m_nCachePos( USHRT_MAX ),
+ m_nLock( 0 ),
+ m_pOwner( pOwn )
{
}
@@ -437,14 +437,14 @@ SwCacheObj::~SwCacheObj()
#ifdef DBG_UTIL
void SwCacheObj::Lock()
{
- OSL_ENSURE( nLock < UCHAR_MAX, "Too many Locks for CacheObject." );
- ++nLock;
+ OSL_ENSURE( m_nLock < UCHAR_MAX, "Too many Locks for CacheObject." );
+ ++m_nLock;
}
void SwCacheObj::Unlock()
{
- OSL_ENSURE( nLock, "No more Locks available." );
- --nLock;
+ OSL_ENSURE( m_nLock, "No more Locks available." );
+ --m_nLock;
}
#endif
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 9897a2032d0a..1fa3093599b0 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -136,34 +136,34 @@ class SwCacheObj
{
friend class SwCache; /// Can do everything
- SwCacheObj *pNext; /// For the LRU chaining
- SwCacheObj *pPrev;
+ SwCacheObj *m_pNext; /// For the LRU chaining
+ SwCacheObj *m_pPrev;
- sal_uInt16 nCachePos; /// Position in the Cache array
+ sal_uInt16 m_nCachePos; /// Position in the Cache array
- sal_uInt8 nLock;
+ sal_uInt8 m_nLock;
- inline SwCacheObj *GetNext() { return pNext; }
- inline SwCacheObj *GetPrev() { return pPrev; }
- inline void SetNext( SwCacheObj *pNew ) { pNext = pNew; }
- inline void SetPrev( SwCacheObj *pNew ) { pPrev = pNew; }
+ inline SwCacheObj *GetNext() { return m_pNext; }
+ inline SwCacheObj *GetPrev() { return m_pPrev; }
+ inline void SetNext( SwCacheObj *pNew ) { m_pNext = pNew; }
+ inline void SetPrev( SwCacheObj *pNew ) { m_pPrev = pNew; }
- inline void SetCachePos( const sal_uInt16 nNew ) { nCachePos = nNew; }
+ inline void SetCachePos( const sal_uInt16 nNew ) { m_nCachePos = nNew; }
protected:
- const void *pOwner;
+ const void *m_pOwner;
public:
SwCacheObj( const void *pOwner );
virtual ~SwCacheObj();
- inline const void *GetOwner() const { return pOwner; }
+ inline const void *GetOwner() const { return m_pOwner; }
inline bool IsOwner( const void *pNew ) const;
- inline sal_uInt16 GetCachePos() const { return nCachePos; }
+ inline sal_uInt16 GetCachePos() const { return m_nCachePos; }
- inline bool IsLocked() const { return 0 != nLock; }
+ inline bool IsLocked() const { return 0 != m_nLock; }
#ifdef DBG_UTIL
void Lock();
@@ -230,7 +230,7 @@ inline void SwCache::DecreaseMax( const sal_uInt16 nSub )
inline bool SwCacheObj::IsOwner( const void *pNew ) const
{
- return pOwner && pOwner == pNew;
+ return m_pOwner && m_pOwner == pNew;
}
inline SwCacheObj *SwCache::Next( SwCacheObj *pCacheObj)
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 6928c1286118..eb107c1ce5e0 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1867,7 +1867,7 @@ SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrm *pConstructor)
SwBorderAttrs::~SwBorderAttrs()
{
- const_cast<SwModify *>(static_cast<SwModify const *>(pOwner))->SetInCache( false );
+ const_cast<SwModify *>(static_cast<SwModify const *>(m_pOwner))->SetInCache( false );
}
/* All calc methods calculate a safety distance in addition to the values given by the attributes.