diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:33 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:07:33 +0000 |
| commit | 9eea692c405f5e290a750aa50ef75c9d5d02c84a (patch) | |
| tree | 91f3db029770a442ad7fee696822f36e869e7325 /sw/inc/grfatr.hxx | |
| parent | 1667860c99f14c5eab5d2f73704e2363d5a70549 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.4.272); FILE MERGED
2003/07/15 03:08:55 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/grfatr.hxx')
| -rw-r--r-- | sw/inc/grfatr.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 234965c4309d..8974b52436df 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: grfatr.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2002-08-23 14:03:54 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:07:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -377,7 +377,7 @@ public: * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ -#ifndef MACOSX +#if !(defined(MACOSX) && ( __GNUC__ < 3 )) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } @@ -409,7 +409,7 @@ inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ -#ifndef MACOSX +#if ! (defined(MACOSX) && ( __GNUC__ < 3 ) ) // GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const { return aSet.GetMirrorGrf(bInP); } |