diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:05:07 +0000 |
| commit | 54e3393c715710739b1a2470d0f98167c41ce476 (patch) | |
| tree | 4c0b8da9cc75c60aff37b559d7586aebf19abec3 /sw/inc/fmtcnct.hxx | |
| parent | 68c30284a44643aa2b9830721b60fa5c66cf0c14 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.3.272); FILE MERGED
2003/07/15 03:08:51 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/fmtcnct.hxx')
| -rw-r--r-- | sw/inc/fmtcnct.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 115dd6f5f6a0..30081cd673b1 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcnct.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2002-08-23 12:52:37 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:04:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,7 +123,7 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) } -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } |