diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:06:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:11:26 +0100 |
| commit | d77368387999918bb703e3ad974497c4422c2e50 (patch) | |
| tree | 92ae1d5c7e959a8d4c7ef69335fbcd6d35ae9d4b /sw/inc/node.hxx | |
| parent | e9c862e9f9ba3cc2eb09c146c8dfd2aaa5cf57bc (diff) | |
sw: prefix members of SwContentNode
Change-Id: Iecb7cd82d88bd1ee82f074e17319e5ce095e2690
Diffstat (limited to 'sw/inc/node.hxx')
| -rw-r--r-- | sw/inc/node.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 9a5b903a0931..66a62506f2df 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -354,7 +354,7 @@ class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndex { //FEATURE::CONDCOLL - SwDepend* pCondColl; + SwDepend* m_pCondColl; //FEATURE::CONDCOLL mutable bool mbSetModifyAtAttr; @@ -717,13 +717,13 @@ inline const SwDoc* SwNode::GetDoc() const inline SwFormatColl* SwContentNode::GetCondFormatColl() const { - return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0; + return m_pCondColl ? static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn()) : 0; } inline SwFormatColl& SwContentNode::GetAnyFormatColl() const { - return pCondColl && pCondColl->GetRegisteredIn() - ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) + return m_pCondColl && m_pCondColl->GetRegisteredIn() + ? *static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn()) : *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); } |