diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:17:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 13:17:13 +0000 |
| commit | 276363e40de3e10a8aaaffe30e547df23d7ba51b (patch) | |
| tree | 7a42baf30f016dc304557cebd28fb2c54b89ee24 /sw/inc/frmatr.hxx | |
| parent | 7ae2339539804d325761b2894279c7bb59ea75aa (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.1.1.1.26.1-1.1.1.1.26.1.2.1) -> HEAD
Diffstat (limited to 'sw/inc/frmatr.hxx')
| -rw-r--r-- | sw/inc/frmatr.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 91d8157aeae0..5d69160af19f 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmatr.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2002-01-25 16:32:27 $ + * last change: $Author: hr $ $Date: 2002-08-23 14:17:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,8 @@ * Implementierung der FrameAttribut Methoden vom SwAttrSet ******************************************************************************/ +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const @@ -134,4 +136,6 @@ inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const { return aSet.GetFrmDir(bInP); } +#endif + #endif //_FRMATR_HXX |