diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:55:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 16:55:17 +0000 |
| commit | caca3ee00c3e7f61d5b91b31bc8627b9176da04a (patch) | |
| tree | ef3d5c1a75650b06a304e2b39699ca08555b7c9a /sw/inc/fmteiro.hxx | |
| parent | 5429cdde20b3ea6f1544efac2e43784af61a2a59 (diff) | |
INTEGRATION: CWS geordi2q14 (1.4.274); FILE MERGED
2004/01/30 14:26:12 hr 1.4.274.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'sw/inc/fmteiro.hxx')
| -rw-r--r-- | sw/inc/fmteiro.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index bb851e95108a..91d6a231c0e4 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmteiro.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:05:07 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:55:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,14 +92,11 @@ public: virtual USHORT GetVersion( USHORT nFFVer ) const; }; -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); } inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const { return aSet.GetEditInReadonly(bInP); } -#endif #endif |