diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:04:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:04:01 +0000 |
| commit | fc75ee4cb831edb1fa02980160298d04d246125c (patch) | |
| tree | fff40d721080dbc5ad1c92532582dafefcaffcb3 /sw/inc/charatr.hxx | |
| parent | 891e39d482749b556e0b38d33ed77009b0325310 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.9.268); FILE MERGED
2003/07/15 03:08:49 fa 1.9.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/charatr.hxx')
| -rw-r--r-- | sw/inc/charatr.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 7ade9950086c..2c5b7fe60270 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: charatr.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2002-08-23 12:25:39 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:04:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,7 @@ inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const { return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); } -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } @@ -176,7 +176,7 @@ inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const { return aSet.GetSize(bInP); } inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const { return aSet.GetPropSize(bInP); } -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const { return aSet.GetFont(bInP); } |