diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:57:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:57:48 +0000 |
| commit | 441ea1c60e72077ee77a98e0f70fb91aa62425e9 (patch) | |
| tree | c60e74e176ea6dbf7aeecf4090430ba57efd4ef6 | |
| parent | 331b3bd5e4fcca4a4d9b340f70feb8814e7a1ea9 (diff) | |
INTEGRATION: CWS geordi2q14 (1.5.274); FILE MERGED
2004/01/30 14:26:14 hr 1.5.274.1: #111934#: merge CWS ooo111fix2
| -rw-r--r-- | sw/inc/fmtline.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 9974201c47..6eef8b7c7c 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtline.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:06:05 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:57:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,14 +105,11 @@ public: void SetCountLines( BOOL b ) { bCountLines = b; } }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// 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 |