diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:44 +0000 |
| commit | b0234719cbdf77d850477782545d41672aa0d408 (patch) | |
| tree | ad3ec32612c5e830e6ca67e385b439ae7dd7c38e /sw/inc/fmtftntx.hxx | |
| parent | e740b60ee9dd4fbe1478e971f28650a30d81b218 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.4.272); FILE MERGED
2003/07/15 03:08:52 fa 1.4.272.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/fmtftntx.hxx')
| -rw-r--r-- | sw/inc/fmtftntx.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index a9f14c93e57c..a7f627a62eb2 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtftntx.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2002-08-23 13:22:49 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:05:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +166,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); } |