diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:01:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:01:57 +0000 |
| commit | eb3e8976794c7e4032e317495707488ce071dcee (patch) | |
| tree | 4d4df2ced22cc0beb83af6243fb5dbf8495cc7cf /sw/inc/grfatr.hxx | |
| parent | e9dab5c31f4d04ba930d6a5c131f4e5c326d75b7 (diff) | |
INTEGRATION: CWS geordi2q14 (1.5.274); FILE MERGED
2004/01/30 14:26:17 hr 1.5.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/grfatr.hxx')
| -rw-r--r-- | sw/inc/grfatr.hxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 8974b52436df..e00256f9e58f 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: grfatr.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:07:33 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:01:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -377,11 +377,8 @@ public: * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ -#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); } -#endif inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const @@ -409,11 +406,8 @@ inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ -#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); } -#endif inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const { return aSet.GetCropGrf(bInP); } inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const |