diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:58:32 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:58:32 +0000 |
commit | e37caea2fa42618d0caf175722330b81ceb82e97 (patch) | |
tree | ec45c60cbfb463ee063e0dd204902d27238bea7c /sw/inc/fmtlsplt.hxx | |
parent | cff381c01a0a2dd8b24746373b448056c65bc665 (diff) |
INTEGRATION: CWS geordi2q14 (1.6.274); FILE MERGED
2004/01/30 14:26:14 hr 1.6.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmtlsplt.hxx')
-rw-r--r-- | sw/inc/fmtlsplt.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 7038927c223d..05956a2b112a 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtlsplt.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:06:16 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:58:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,14 +89,11 @@ public: virtual USHORT GetVersion( USHORT nFFVer ) const; }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); } inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const { return aSet.GetLayoutSplit(bInP); } -#endif #endif |