diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:52:37 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 11:52:37 +0000 |
commit | c54d70ff227e40b93624a70b57fae9c8d6bc7c32 (patch) | |
tree | 18f3930ca8187ffef120cfde8bf59f1dd6077309 /sw/inc/fmtanchr.hxx | |
parent | 4a81bab411c79882a9ec4be7a10e38c6e14a8018 (diff) |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtanchr.hxx')
-rw-r--r-- | sw/inc/fmtanchr.hxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index db235933ade4..0bad11bf0269 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtanchr.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 12:43:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,10 +121,14 @@ public: void SetAnchor( const SwPosition *pPos ); }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const - { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } + { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } + + inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const + { return aSet.GetAnchor(bInP); } +#endif -inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const - { return aSet.GetAnchor(bInP); } #endif |