diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-09 20:57:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-12 09:38:59 +0000 |
| commit | a28c265ea4bf318cd993673cab88f609d7294220 (patch) | |
| tree | 71b3b30397df36d292f27e1af2ceb14f044cce53 /sw/inc | |
| parent | f836ad5caa4f3b83d6382afdda5dbe18719f6096 (diff) | |
de-ICC this for maximum readability
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/ndole.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/ndtxt.hxx | 10 | ||||
| -rw-r--r-- | sw/inc/node.hxx | 23 |
3 files changed, 14 insertions, 22 deletions
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index d66f387eb4f3..f09f39ef1d89 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -156,11 +156,12 @@ public: }; -// Inline methods from Node.hxx - we know TxtNode only here!! +// Inline methods from Node.hxx inline SwOLENode *SwNode::GetOLENode() { return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0; } + inline const SwOLENode *SwNode::GetOLENode() const { return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 381fc85cd129..52bae7a74b89 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -843,18 +843,16 @@ inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn())); } -// For IBM-Compiler do not inline this because of 42876 -#ifndef ICC -// Inline methods from Node.hxx - we know TxtNode only now!! -inline SwTxtNode *SwNode::GetTxtNode() +// Inline methods from Node.hxx +inline SwTxtNode *SwNode::GetTxtNode() { return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0; } -inline const SwTxtNode *SwNode::GetTxtNode() const + +inline const SwTxtNode *SwNode::GetTxtNode() const { return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0; } -#endif inline void SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart, diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index ec8f58fb1024..bbe3c5934be9 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -149,21 +149,14 @@ public: inline const SwCntntNode *GetCntntNode() const; inline SwEndNode *GetEndNode(); inline const SwEndNode *GetEndNode() const; -#ifndef ICC - inline -#endif - SwTxtNode *GetTxtNode(); - -#ifndef ICC - inline -#endif - const SwTxtNode *GetTxtNode() const; - inline SwOLENode *GetOLENode(); - inline const SwOLENode *GetOLENode() const; - inline SwNoTxtNode *GetNoTxtNode(); - inline const SwNoTxtNode *GetNoTxtNode() const; - inline SwGrfNode *GetGrfNode(); - inline const SwGrfNode *GetGrfNode() const; + inline SwTxtNode *GetTxtNode(); + inline const SwTxtNode *GetTxtNode() const; + inline SwOLENode *GetOLENode(); + inline const SwOLENode *GetOLENode() const; + inline SwNoTxtNode *GetNoTxtNode(); + inline const SwNoTxtNode *GetNoTxtNode() const; + inline SwGrfNode *GetGrfNode(); + inline const SwGrfNode *GetGrfNode() const; inline SwTableNode *GetTableNode(); inline const SwTableNode *GetTableNode() const; inline SwSectionNode *GetSectionNode(); |