diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:21:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-23 12:21:17 +0000 |
| commit | 3b72303c7d87eac3d9bf2302cf760b401226ea2a (patch) | |
| tree | ed41d8eeca505da572b48aae3544ff0831252346 /sw/inc/fmtornt.hxx | |
| parent | 27c3317c51132ae9a496666062cfe0c306fb12be (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.4-1.4.16.1) -> HEAD
Diffstat (limited to 'sw/inc/fmtornt.hxx')
| -rw-r--r-- | sw/inc/fmtornt.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 92f45c95c2f9..263063f374c6 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtornt.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2001-07-09 20:10:42 $ + * last change: $Author: hr $ $Date: 2002-08-23 13:21:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,6 +181,8 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } +#ifndef MACOSX +// GrP moved to gcc_outl.cxx inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const @@ -190,7 +192,7 @@ inline const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const { return aSet.GetVertOrient(bInP); } inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const { return aSet.GetHoriOrient(bInP); } - +#endif #endif |