diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:02:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:02:53 +0000 |
| commit | 2da096f1c642e6bcde66adbb13e20f765c9e25eb (patch) | |
| tree | 2262bd93e829c53a5f5544066a7bafd59eb907a6 /sw/inc/ndnotxt.hxx | |
| parent | b9c56b766e46421bbbce5100a4dad1d9d3027450 (diff) | |
INTEGRATION: CWS geordi2q14 (1.6.274); FILE MERGED
2004/01/30 14:26:17 hr 1.6.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/ndnotxt.hxx')
| -rw-r--r-- | sw/inc/ndnotxt.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 1babe16e1b96..e2a8d3a19379 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndnotxt.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:07:54 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:02:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,8 +141,6 @@ inline SwGrfFmtColl* SwNoTxtNode::GetGrfColl() const } // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwNoTxtNode *SwNode::GetNoTxtNode() { return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0; @@ -151,6 +149,5 @@ inline const SwNoTxtNode *SwNode::GetNoTxtNode() const { return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0; } -#endif #endif // _NDNOTXT_HXX |