diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:55:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:55:37 +0000 |
| commit | 957f02917ef795bfd5df2810b7b1111371516b3b (patch) | |
| tree | b8230f5eced30e275b3779c36dad0538a9fab876 /sw/inc/fmtcntnt.hxx | |
| parent | b50468fd5a6ded3022da30f045c42060479b3084 (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.1-1.1.1.32.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtcntnt.hxx')
| -rw-r--r-- | sw/inc/fmtcntnt.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index a7aba5dbf6..2fe315d930 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcntnt.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $ + * last change: $Author: hr $ $Date: 2002-08-23 12:55:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,11 +98,14 @@ public: void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; +#ifndef MACOSX +// GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const { return aSet.GetCntnt(bInP); } +#endif #endif |