diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:18:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:18:41 +0000 |
| commit | 8aee5c8e4eea246491d82b51eca6e1ec09dde8ab (patch) | |
| tree | 7ff1fe055c64ba942ebaae324462313fdcaba65a /sw/inc/ndnotxt.hxx | |
| parent | 276363e40de3e10a8aaaffe30e547df23d7ba51b (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.3-1.3.20.1) -> HEAD
Diffstat (limited to 'sw/inc/ndnotxt.hxx')
| -rw-r--r-- | sw/inc/ndnotxt.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index c7654bcd739d..3da56edb1122 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndnotxt.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2002-07-24 13:07:45 $ + * last change: $Author: hr $ $Date: 2002-08-23 14:18:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,6 +141,8 @@ inline SwGrfFmtColl* SwNoTxtNode::GetGrfColl() const } // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwNoTxtNode *SwNode::GetNoTxtNode() { return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0; @@ -149,6 +151,6 @@ inline const SwNoTxtNode *SwNode::GetNoTxtNode() const { return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0; } - +#endif #endif // _NDNOTXT_HXX |