diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:07:56 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:11:27 +0100 |
| commit | d270705e7645eccaefbf452ad68276080204399f (patch) | |
| tree | f1e15f6c73e4dfbd58109627d1475003e4e980d6 /sw/inc | |
| parent | d77368387999918bb703e3ad974497c4422c2e50 (diff) | |
sw: prefix members of SwCollCondition
Change-Id: Idf7956c2178093bcaba3ad1093b8d0a54e46aaca
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/fmtcol.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 618e3baf854d..57d29ea4b714 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -176,12 +176,12 @@ enum Master_CollConditions class SW_DLLPUBLIC SwCollCondition : public SwClient { - sal_uLong nCondition; + sal_uLong m_nCondition; union { sal_uLong nSubCondition; OUString* pFieldExpression; - } aSubCondition; + } m_aSubCondition; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. @@ -203,10 +203,10 @@ public: bool operator!=( const SwCollCondition& rCmp ) const { return ! (*this == rCmp); } - sal_uLong GetCondition() const { return nCondition; } - sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; } + sal_uLong GetCondition() const { return m_nCondition; } + sal_uLong GetSubCondition() const { return m_aSubCondition.nSubCondition; } const OUString* GetFieldExpression() const - { return aSubCondition.pFieldExpression; } + { return m_aSubCondition.pFieldExpression; } void SetCondition( sal_uLong nCond, sal_uLong nSubCond ); SwTextFormatColl* GetTextFormatColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } |