diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:32:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:32:13 +0000 |
| commit | a44459843699eebaaed2fbbb04450d0663d1b4f0 (patch) | |
| tree | 7d33e6cce129cfea15a0950c6f7499e5f956cb1b /sw/inc/fmtline.hxx | |
| parent | 05a554f80305d33c61de0586c7fbaf2ec8bc0bf7 (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtline.hxx')
| -rw-r--r-- | sw/inc/fmtline.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 1ac6c2e28d0b..d14121440c2d 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtline.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mba $ $Date: 2002-06-10 17:00:58 $ + * last change: $Author: hr $ $Date: 2002-08-23 13:32:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,11 +105,14 @@ public: void SetCountLines( BOOL b ) { bCountLines = b; } }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); } inline const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const { return aSet.GetLineNumber(bInP); } +#endif #endif |