diff options
-rw-r--r-- | sw/inc/fmtcnct.hxx | 7 | ||||
-rw-r--r-- | sw/inc/fmteiro.hxx | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 30081cd673b1..5a64422da23e 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcnct.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-07-16 18:04:44 $ + * last change: $Author: hr $ $Date: 2004-02-02 17:54:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,14 +123,11 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy ) } -#if !(defined(MACOSX) && ( __GNUC__ < 3 )) -// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } inline const SwFmtChain &SwFmt::GetChain(BOOL bInP) const { return aSet.GetChain(bInP); } -#endif #endif 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 |