#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.1.1.1.26.1-1.1.1.1.26.1.2.1) -> HEAD

This commit is contained in:
Jens-Heiner Rechtien 2002-08-23 13:17:13 +00:00
parent 7ae2339539
commit 276363e40d

View file

@ -2,9 +2,9 @@
*
* $RCSfile: frmatr.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: jp $ $Date: 2002-01-25 16:32:27 $
* last change: $Author: hr $ $Date: 2002-08-23 14:17:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -75,6 +75,8 @@
* Implementierung der FrameAttribut Methoden vom SwAttrSet
******************************************************************************/
#ifndef MACOSX
// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const
{ return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); }
inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const
@ -134,4 +136,6 @@ inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const
{ return aSet.GetFrmDir(bInP); }
#endif
#endif //_FRMATR_HXX