diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:24:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:24:47 +0000 |
| commit | edd2efed8185ef35036c2f399de9b2fa9ce58ae2 (patch) | |
| tree | 06aa70a7b4a73b68458c3a2836165ff158b0b165 /sw/inc/fmtpdsc.hxx | |
| parent | 283def1c3ad73f75ce7d3240d5d273dad3e34c03 (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.5-1.5.16.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtpdsc.hxx')
| -rw-r--r-- | sw/inc/fmtpdsc.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index a1f63772042b..9b018c0dc366 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtpdsc.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dvo $ $Date: 2001-07-09 20:10:42 $ + * last change: $Author: hr $ $Date: 2002-08-23 13:24:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,12 +136,15 @@ public: void SetDescNameIdx( USHORT n ) { nDescNameIdx = n; } }; + +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } inline const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const { return aSet.GetPageDesc(bInP); } - +#endif #endif |