diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:54 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:54 +0000 |
commit | 1ecf0b9447b06e2ef25ce2292ee8446f08c7b2af (patch) | |
tree | c69a918595f1cd376b85c785af509241680141f6 /sw/inc/ndnotxt.hxx | |
parent | 4db4a701e3517485ccfcdb17168262cf2cd5aefa (diff) |
INTEGRATION: CWS ooo11rc2 (1.5.268); FILE MERGED
2003/07/15 03:08:56 fa 1.5.268.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/issues/show_bug.cgi?id=16849
Contributor:
Kevin Hendricks
Dan
fa@ooo
Diffstat (limited to 'sw/inc/ndnotxt.hxx')
-rw-r--r-- | sw/inc/ndnotxt.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 3da56edb1122..1babe16e1b96 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndnotxt.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2002-08-23 14:18:41 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:07:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,7 +141,7 @@ inline SwGrfFmtColl* SwNoTxtNode::GetGrfColl() const } // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwNoTxtNode *SwNode::GetNoTxtNode() { |