diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:03:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:03:54 +0000 |
| commit | cd8d76743db8af2e798b36330b58978b201200a5 (patch) | |
| tree | 4a471f6d33805a6f1e6cf300826ddf4a44bacfa7 /sw/inc/grfatr.hxx | |
| parent | d9d3db01ea3c95c5b43b010c15899ea7f348fe69 (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.3-1.3.20.1) -> HEAD
Diffstat (limited to 'sw/inc/grfatr.hxx')
| -rw-r--r-- | sw/inc/grfatr.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 6ccb6f4af38a..234965c4309d 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: grfatr.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2001-05-13 03:32:47 $ + * last change: $Author: hr $ $Date: 2002-08-23 14:03:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -377,8 +377,11 @@ public: * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ +#ifndef MACOSX +// 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 @@ -406,8 +409,11 @@ inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ +#ifndef MACOSX +// 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 |