#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.2-1.2.20.1) -> HEAD

4 files changed, 25 insertions, 11 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
 
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 6c65ae569c99..911c85388818 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtclbl.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:46:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,11 +92,15 @@ public:
 */  virtual USHORT           GetVersion( USHORT nFFVer ) const;
 };
 
+
+#ifndef MACOSX
+// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const
     { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); }
 
 inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const
     { return aSet.GetBalancedColumns( bInP ); }
+#endif
 
 #endif
 
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 62fef778e064..d4556335058b 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtclds.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:49:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -212,11 +212,14 @@ public:
     USHORT CalcPrtColWidth( USHORT nCol, USHORT nAct ) const;
 };
 
+#ifndef MACOSX
+// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const
     { return (const SwFmtCol&)Get( RES_COL,bInP); }
 
 inline const SwFmtCol &SwFmt::GetCol(BOOL bInP) const
     { return aSet.GetCol(bInP); }
+#endif
 
 #endif
 
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index cf3aa0f38786..115dd6f5f6a0 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtcnct.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:52:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,11 +123,14 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
 }
 
 
+#ifndef MACOSX
+// 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