diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:03:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:03:15 +0000 |
| commit | 2fc8c079d2af491b872b3ae629ff419676bf88f8 (patch) | |
| tree | 811e2330790f89fd2e9d04d417da417f2ec2ce48 /sw/inc/fmteiro.hxx | |
| parent | 34309089a2c84c2879c1cc4715ddbf9a17f61a64 (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmteiro.hxx')
| -rw-r--r-- | sw/inc/fmteiro.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index f468de78371e..ad66dcf877d2 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmteiro.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2001-05-13 03:32:47 $ + * last change: $Author: hr $ $Date: 2002-08-23 13:03:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,11 +92,14 @@ public: virtual USHORT GetVersion( USHORT nFFVer ) const; }; +#ifndef MACOSX +// 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 |