diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:54 +0000 |
| commit | 4ceeedd49fc37a9679a30238e78596585c4c6230 (patch) | |
| tree | 059da842c87d16975d5e32dbd35f3dd43429d0ae /sw/inc/fmthdft.hxx | |
| parent | b0234719cbdf77d850477782545d41672aa0d408 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.3.272); FILE MERGED
2003/07/15 03:08:52 fa 1.3.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/fmthdft.hxx')
| -rw-r--r-- | sw/inc/fmthdft.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 340020d746fb..cc8679d55708 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmthdft.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2002-08-23 13:23:55 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,7 +146,7 @@ public: void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } }; -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 ) ) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } |