diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:02:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:02:30 +0000 |
| commit | b9c56b766e46421bbbce5100a4dad1d9d3027450 (patch) | |
| tree | 1cb0bcb8800d7bf2d56a5fede5d582364951fe47 /sw/inc | |
| parent | eb3e8976794c7e4032e317495707488ce071dcee (diff) | |
INTEGRATION: CWS geordi2q14 (1.11.274); FILE MERGED
2004/01/30 14:26:17 hr 1.11.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/ndgrf.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 4ea6607dc0a5..b2fc3d5ace32 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndgrf.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:07:43 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:02:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -217,8 +217,6 @@ public: // ---------------------------------------------------------------------- // 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 SwGrfNode *SwNode::GetGrfNode() { return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0; @@ -227,7 +225,6 @@ inline const SwGrfNode *SwNode::GetGrfNode() const { return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0; } -#endif #ifndef _FESHVIEW_ONLY_INLINE_NEEDED inline BOOL SwGrfNode::IsLinkedFile() const |