Currently you can only compile MacOSX using GCC 4.0; remove <3 code

Plus the gcc_outl.cxx file is missing so it wouldn't work anyways.

33 files changed, 42 insertions, 455 deletions

diff --git a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
index f8f2474d8..abf7c7d7f 100644
--- a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
+++ b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
@@ -55,10 +55,6 @@ namespace binfilter {
 class ChartModel;
 class SchChartDocShell;
 } //namespace binfilter
-// GrP gcc 2.95.2 on Mac OS X chokes on this huge template class.
-// Expand the template by hand.
-//#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-#if 1
 
 //  Construct a WeakImplHelper14 with the emphasis on 14.
 //  Fourteen interfaces are two to many to use the newer template definition
@@ -80,121 +76,6 @@ __DEF_IMPLHELPER_PRE(14)
     __IFC_WRITEOFFSET(13) __IFC_WRITEOFFSET(14)
 __DEF_IMPLHELPER_POST(14)
 
-// !defined(MACOSX)
-#else
-// defined(MACOSX) && (__GNUC__ < 3 )
-
-namespace cppu {
-    struct ClassData14 : public ClassDataBase
-    {
-        Type_Offset arType2Offset[ 14 ];
-        ClassData14( ) SAL_THROW( () )
-            : ClassDataBase( 14 )
-            {}
-    };
-
-    class SAL_NO_VTABLE ImplHelperBase14
-        : public ::com::sun::star::lang::XTypeProvider
-        , public ::com::sun::star::chart::XDiagram,
-                      public ::com::sun::star::chart::XAxisZSupplier,
-                      public ::com::sun::star::chart::XTwoAxisXSupplier,
-                      public ::com::sun::star::chart::XTwoAxisYSupplier,
-                      public ::com::sun::star::chart::XStatisticDisplay,
-                      public ::com::sun::star::chart::X3DDisplay,
-                      public ::com::sun::star::beans::XPropertySet,
-                      public ::com::sun::star::beans::XMultiPropertySet,
-                      public ::com::sun::star::beans::XPropertyState,
-                      public ::com::sun::star::beans::XMultiPropertyStates,
-                      public ::com::sun::star::lang::XServiceInfo,
-                      public ::com::sun::star::lang::XUnoTunnel,
-                      public ::com::sun::star::lang::XComponent,
-                      public ::com::sun::star::lang::XEventListener
-    {
-    protected:
-        ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () )
-            {
-                ClassData & rCD = * static_cast< ClassData * >( &s_aCD );
-                if (! rCD.bOffsetsInit)
-                {
-                    ::osl::MutexGuard aGuard( getImplHelperInitMutex() );
-                    if (! rCD.bOffsetsInit)
-                    {
-                        char * pBase = (char *)this;
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > *)0 ),
-                                             (char *)(::com::sun::star::chart::XDiagram *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxisZSupplier > *)0 ),
-                                             (char *)(::com::sun::star::chart::XAxisZSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XTwoAxisXSupplier > *)0 ),
-                                             (char *)(::com::sun::star::chart::XTwoAxisXSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XTwoAxisYSupplier > *)0 ),
-                                             (char *)(::com::sun::star::chart::XTwoAxisYSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XStatisticDisplay > *)0 ),
-                                             (char *)(::com::sun::star::chart::XStatisticDisplay *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::X3DDisplay > *)0 ),
-                                             (char *)(::com::sun::star::chart::X3DDisplay *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
-                                             (char *)(::com::sun::star::beans::XPropertySet *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                             (char *)(::com::sun::star::beans::XMultiPropertySet *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ),
-                                             (char *)(::com::sun::star::beans::XPropertyState *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertyStates > *)0 ),
-                                             (char *)(::com::sun::star::beans::XMultiPropertyStates *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ),
-                                             (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ),
-                                             (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > *)0 ),
-                                             (char *)(::com::sun::star::lang::XComponent *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > *)0 ),
-                                             (char *)(::com::sun::star::lang::XEventListener *)this - pBase );
-                        rCD.bOffsetsInit = sal_True;
-                    }
-                }
-                return rCD;
-            }
-    };
-
-
-    class SAL_NO_VTABLE ImplHelper14
-        : public ImplHelperBase14
-    {
-        static ClassData14 s_aCD;
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getTypes(); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getImplementationId(); }
-    };
-
-
-    class SAL_NO_VTABLE WeakImplHelper14
-        : public ::cppu::OWeakObject
-        , public ImplHelperBase14
-    {
-        static ClassData14 s_aCD;
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            {
-                ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ) );
-                return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getTypes(); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getImplementationId(); }
-    };
-
-  // namespace ::cppu
-}
-
-#endif
 namespace binfilter {
     class ChXDiagram : public ::cppu::WeakImplHelper14
  <
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 08f827fc6..948250764 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -110,11 +110,6 @@ using rtl::OUString;
 
 extern SchUnoPropertyMapProvider aSchMapProvider;
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-static cppu::ClassData14 cppu::ImplHelper14::s_aCD;
-static cppu::ClassData14 cppu::WeakImplHelper14::s_aCD;
-#endif
-
 #define MATRIX4D_TO_HOMOGEN_MATRIX( m, h ) \
     h.Line1.Column1 = m[0][0]; \
     h.Line1.Column2 = m[0][1]; \
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index dd715af2a..a8fd09bf4 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -83,12 +83,6 @@
 #include <unicode/ubidi.h>
 namespace binfilter {
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-// moved from editundo.hxx
-const EPaM& EditUndoRemoveChars::GetEPaM() { return aEPaM; }
-String& EditUndoRemoveChars::GetStr() { return aText; }
-#endif
-
 using namespace ::com::sun::star;
 
 /*N*/ USHORT lcl_CalcExtraSpace( const SvxLineSpacingItem& rLSItem )
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 26e4bd941..1e868c740 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -124,12 +124,6 @@ using namespace ::com::sun::star::i18n;
 using ::rtl::OUString;
 using ::osl::FileBase;
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-static cppu::ClassData27 cppu::ImplHelper27::s_aCD;
-static cppu::ClassData27 cppu::WeakImplHelper27::s_aCD;
-#endif
-
-
 #define SW_CREATE_DASH_TABLE            0x01
 #define SW_CREATE_GRADIENT_TABLE        0x02
 #define SW_CREATE_HATCH_TABLE           0x03
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index 10d1429dd..f5eb78b34 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -919,7 +919,7 @@ public:\
 #define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
 #define C40_GETPOS( c, r) GetPos( (c const *)r )
 #else
-#if defined ICC|| (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined ICC || defined GCC || ( defined(WNT) && _MSC_VER >= 1400)
 #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
 #define C40_PUSH( c, p) Push( (c const *&) p )
 #define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
diff --git a/binfilter/inc/bf_svx/xoutx.hxx b/binfilter/inc/bf_svx/xoutx.hxx
index 56bd9a711..1eef851e2 100644
--- a/binfilter/inc/bf_svx/xoutx.hxx
+++ b/binfilter/inc/bf_svx/xoutx.hxx
@@ -83,11 +83,6 @@ struct ImpData
 |*
 \************************************************************************/
 
-#if defined(MACOSX) && (__GNUC__ < 3)
-static Brush aBrush;
-static Pen aPen;
-#endif
-
 class XOutputDevice
 {
 private:
diff --git a/binfilter/inc/bf_sw/cellatr.hxx b/binfilter/inc/bf_sw/cellatr.hxx
index a3629041b..604c1b512 100644
--- a/binfilter/inc/bf_sw/cellatr.hxx
+++ b/binfilter/inc/bf_sw/cellatr.hxx
@@ -116,27 +116,21 @@ public:
 
 //***************************************************************************
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwTblBoxNumFormat      &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
     {   return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
 inline const SwTblBoxFormula        &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
     {   return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
 inline const SwTblBoxValue          &SwAttrSet::GetTblBoxValue(BOOL bInP) const
     {   return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
-#endif
 
 //***************************************************************************
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwTblBoxNumFormat      &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
     {   return aSet.GetTblBoxNumFmt(bInP); }
 inline const SwTblBoxFormula        &SwFmt::GetTblBoxFormula(BOOL bInP) const
     {   return aSet.GetTblBoxFormula(bInP); }
 inline const SwTblBoxValue          &SwFmt::GetTblBoxValue(BOOL bInP) const
     {   return aSet.GetTblBoxValue(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/charatr.hxx b/binfilter/inc/bf_sw/charatr.hxx
index 9e7a01cd1..5e1b626ba 100644
--- a/binfilter/inc/bf_sw/charatr.hxx
+++ b/binfilter/inc/bf_sw/charatr.hxx
@@ -73,12 +73,8 @@ inline const SvxFontHeightItem         &SwAttrSet::GetCTLSize(BOOL bInP) const
     {   return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
 inline const SvxPropSizeItem     &SwAttrSet::GetPropSize(BOOL bInP) const
     {   return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); }
-
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SvxFontItem         &SwAttrSet::GetFont(BOOL bInP) const
     {   return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
-#endif
 inline const SvxFontItem         &SwAttrSet::GetCJKFont(BOOL bInP) const
     {   return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); }
 inline const SvxFontItem         &SwAttrSet::GetCTLFont(BOOL bInP) const
@@ -141,11 +137,8 @@ inline const SvxFontHeightItem             &SwFmt::GetSize(BOOL bInP) const
     {   return aSet.GetSize(bInP); }
 inline const SvxPropSizeItem         &SwFmt::GetPropSize(BOOL bInP) const
     {   return aSet.GetPropSize(bInP); }
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SvxFontItem             &SwFmt::GetFont(BOOL bInP) const
     {   return aSet.GetFont(bInP); }
-#endif
 inline const SvxFontItem         &SwFmt::GetCJKFont(BOOL bInP) const
     {   return aSet.GetCJKFont(bInP); }
 inline const SvxFontItem         &SwFmt::GetCTLFont(BOOL bInP) const
diff --git a/binfilter/inc/bf_sw/fmtanchr.hxx b/binfilter/inc/bf_sw/fmtanchr.hxx
index 26e58b8ca..5437c1f0a 100644
--- a/binfilter/inc/bf_sw/fmtanchr.hxx
+++ b/binfilter/inc/bf_sw/fmtanchr.hxx
@@ -78,14 +78,11 @@ public:
     void SetAnchor( const SwPosition *pPos );
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
      { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); }
 
  inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
      { return aSet.GetAnchor(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtclbl.hxx b/binfilter/inc/bf_sw/fmtclbl.hxx
index 7fb23ad5d..8653345db 100644
--- a/binfilter/inc/bf_sw/fmtclbl.hxx
+++ b/binfilter/inc/bf_sw/fmtclbl.hxx
@@ -52,14 +52,11 @@ public:
 };
 
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// 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
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtclds.hxx b/binfilter/inc/bf_sw/fmtclds.hxx
index 20e2121f9..75daa57c2 100644
--- a/binfilter/inc/bf_sw/fmtclds.hxx
+++ b/binfilter/inc/bf_sw/fmtclds.hxx
@@ -161,14 +161,11 @@ public:
     //den Anwender die Spalte ist - geliefert.
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// 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
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtcntnt.hxx b/binfilter/inc/bf_sw/fmtcntnt.hxx
index 727797487..527bcb960 100644
--- a/binfilter/inc/bf_sw/fmtcntnt.hxx
+++ b/binfilter/inc/bf_sw/fmtcntnt.hxx
@@ -45,7 +45,6 @@ class SwFmtCntnt: public SfxPoolItem
     SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
 
 public:
-//  SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
     SwFmtCntnt( const SwStartNode* pStartNode = 0 );
     SwFmtCntnt( const SwFmtCntnt &rCpy );
     ~SwFmtCntnt();
@@ -60,14 +59,11 @@ public:
     void SetNewCntntIdx( const SwNodeIndex *pIdx );
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.hxx; revisit with gcc3
 inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const
     { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); }
 
 inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const
     { return aSet.GetCntnt(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmteiro.hxx b/binfilter/inc/bf_sw/fmteiro.hxx
index 9e12dc3e1..e57b9937d 100644
--- a/binfilter/inc/bf_sw/fmteiro.hxx
+++ b/binfilter/inc/bf_sw/fmteiro.hxx
@@ -51,14 +51,11 @@ public:
     virtual USHORT           GetVersion( USHORT nFFVer ) const;
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// 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
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtfordr.hxx b/binfilter/inc/bf_sw/fmtfordr.hxx
index 4f46b12c2..422a35ba8 100644
--- a/binfilter/inc/bf_sw/fmtfordr.hxx
+++ b/binfilter/inc/bf_sw/fmtfordr.hxx
@@ -68,14 +68,11 @@ inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
     return *this;
 }
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const
     { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); }
 
 inline const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const
     { return aSet.GetFillOrder(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtfsize.hxx b/binfilter/inc/bf_sw/fmtfsize.hxx
index 89258a08d..c763dac38 100644
--- a/binfilter/inc/bf_sw/fmtfsize.hxx
+++ b/binfilter/inc/bf_sw/fmtfsize.hxx
@@ -102,14 +102,11 @@ public:
                                       const SvxULSpaceItem *pULSpace ) const;
 };
 
-#if !(defined(MACOSX) &&  ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const
     { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); }
 
 inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const
     { return aSet.GetFrmSize(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtftntx.hxx b/binfilter/inc/bf_sw/fmtftntx.hxx
index fdecd6ecf..047e5c6d1 100644
--- a/binfilter/inc/bf_sw/fmtftntx.hxx
+++ b/binfilter/inc/bf_sw/fmtftntx.hxx
@@ -118,19 +118,15 @@ public:
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const
     { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); }
 inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const
     { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); }
 
-
 inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const
     { return aSet.GetFtnAtTxtEnd(bInP); }
 inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const
     { return aSet.GetEndAtTxtEnd(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmthdft.hxx b/binfilter/inc/bf_sw/fmthdft.hxx
index 4d5ce9432..8e42837ad 100644
--- a/binfilter/inc/bf_sw/fmthdft.hxx
+++ b/binfilter/inc/bf_sw/fmthdft.hxx
@@ -96,8 +96,6 @@ public:
     void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ <  3 ) )
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const
     { return (const SwFmtHeader&)Get( RES_HEADER,bInP); }
 inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const
@@ -107,7 +105,6 @@ inline const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const
     { return aSet.GetHeader(bInP); }
 inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const
     { return aSet.GetFooter(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtline.hxx b/binfilter/inc/bf_sw/fmtline.hxx
index a8b7bdce5..11a16789f 100644
--- a/binfilter/inc/bf_sw/fmtline.hxx
+++ b/binfilter/inc/bf_sw/fmtline.hxx
@@ -63,14 +63,11 @@ public:
     void SetCountLines( BOOL b )     { bCountLines = b;    }
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const
     { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); }
 
 inline const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const
     { return aSet.GetLineNumber(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtlsplt.hxx b/binfilter/inc/bf_sw/fmtlsplt.hxx
index 8bde656ce..283104bd4 100644
--- a/binfilter/inc/bf_sw/fmtlsplt.hxx
+++ b/binfilter/inc/bf_sw/fmtlsplt.hxx
@@ -48,14 +48,11 @@ public:
     virtual USHORT           GetVersion( USHORT nFFVer ) const;
 };
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const
     { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); }
 
 inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const
     { return aSet.GetLayoutSplit(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtornt.hxx b/binfilter/inc/bf_sw/fmtornt.hxx
index 44e3f9f26..0999b0290 100644
--- a/binfilter/inc/bf_sw/fmtornt.hxx
+++ b/binfilter/inc/bf_sw/fmtornt.hxx
@@ -129,8 +129,6 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy
     return *this;
 }
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// 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
@@ -140,7 +138,6 @@ 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
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmtsrnd.hxx b/binfilter/inc/bf_sw/fmtsrnd.hxx
index 58c24463d..61282db2e 100644
--- a/binfilter/inc/bf_sw/fmtsrnd.hxx
+++ b/binfilter/inc/bf_sw/fmtsrnd.hxx
@@ -91,14 +91,11 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
     return *this;
 }
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.hxx; revisit with gcc3
 inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const
     { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); }
 
 inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const
     { return aSet.GetSurround(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/fmturl.hxx b/binfilter/inc/bf_sw/fmturl.hxx
index e12817660..eaeaa88fc 100644
--- a/binfilter/inc/bf_sw/fmturl.hxx
+++ b/binfilter/inc/bf_sw/fmturl.hxx
@@ -80,14 +80,11 @@ public:
 };
 
 
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const
     { return (const SwFmtURL&)Get( RES_URL,bInP); }
 
 inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const
     { return aSet.GetURL(bInP); }
-#endif
 
 } //namespace binfilter
 #endif
diff --git a/binfilter/inc/bf_sw/format.hxx b/binfilter/inc/bf_sw/format.hxx
index 945cbc47e..b1d81ea5a 100644
--- a/binfilter/inc/bf_sw/format.hxx
+++ b/binfilter/inc/bf_sw/format.hxx
@@ -154,12 +154,6 @@ public:
                                    nWhichId == RES_DRAWFRMFMT||
                                    nWhichId == RES_FRMFMT; }
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
-#define INLINE inline
-#endif
-
     // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in
     //              den Parents gesucht werden soll. Wird nichts gefunden,
     //              wird das deflt. Attribut returnt.
@@ -176,7 +170,7 @@ public:
     inline const SvxCrossedOutItem   &GetCrossedOut( BOOL = TRUE ) const;
     inline const SvxFontHeightItem   &GetSize( BOOL = TRUE ) const;
     inline const SvxPropSizeItem     &GetPropSize( BOOL = TRUE ) const;
-    INLINE const SvxFontItem         &GetFont( BOOL = TRUE ) const;
+    inline const SvxFontItem         &GetFont( BOOL = TRUE ) const;
     inline const SvxColorItem        &GetColor( BOOL = TRUE ) const;
     inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const;
     inline const SvxLanguageItem     &GetLanguage( BOOL = TRUE ) const;
@@ -204,43 +198,43 @@ public:
     inline const SvxCharReliefItem   &GetCharRelief( BOOL = TRUE ) const;
 
     // Frame-Attribute  - impl. steht im frmatr.hxx,
-    INLINE const SwFmtFillOrder         &GetFillOrder( BOOL = TRUE ) const;
-    INLINE const SwFmtFrmSize           &GetFrmSize( BOOL = TRUE ) const;
-    INLINE const SwFmtHeader            &GetHeader( BOOL = TRUE ) const;
-    INLINE const SwFmtFooter            &GetFooter( BOOL = TRUE ) const;
-    INLINE const SwFmtSurround          &GetSurround( BOOL = TRUE ) const;
-    INLINE const SwFmtHoriOrient        &GetHoriOrient( BOOL = TRUE ) const;
-    INLINE const SwFmtAnchor            &GetAnchor( BOOL = TRUE ) const;
-    INLINE const SwFmtCol               &GetCol( BOOL = TRUE ) const;
-    INLINE const SvxPaperBinItem        &GetPaperBin( BOOL = TRUE ) const;
-    INLINE const SvxLRSpaceItem         &GetLRSpace( BOOL = TRUE ) const;
-    INLINE const SvxULSpaceItem         &GetULSpace( BOOL = TRUE ) const;
-    INLINE const SwFmtCntnt             &GetCntnt( BOOL = TRUE ) const;
-    INLINE const SvxPrintItem           &GetPrint( BOOL = TRUE ) const;
-    INLINE const SvxOpaqueItem          &GetOpaque( BOOL = TRUE ) const;
-    INLINE const SvxProtectItem         &GetProtect( BOOL = TRUE ) const;
-    INLINE const SwFmtVertOrient        &GetVertOrient( BOOL = TRUE ) const;
-    INLINE const SvxBoxItem             &GetBox( BOOL = TRUE ) const;
-    INLINE const SvxFmtKeepItem         &GetKeep( BOOL = TRUE ) const;
-    INLINE const SvxBrushItem           &GetBackground( BOOL = TRUE ) const;
-    INLINE const SvxShadowItem          &GetShadow( BOOL = TRUE ) const;
-    INLINE const SwFmtPageDesc          &GetPageDesc( BOOL = TRUE ) const;
-    INLINE const SvxFmtBreakItem        &GetBreak( BOOL = TRUE ) const;
-    INLINE const SvxMacroItem           &GetMacro( BOOL = TRUE ) const;
-    INLINE const SwFmtURL               &GetURL( BOOL = TRUE ) const;
-    INLINE const SwFmtEditInReadonly    &GetEditInReadonly( BOOL = TRUE ) const;
-    INLINE const SwFmtLayoutSplit       &GetLayoutSplit( BOOL = TRUE ) const;
-    INLINE const SwFmtChain             &GetChain( BOOL = TRUE ) const;
-    INLINE const SwFmtLineNumber        &GetLineNumber( BOOL = TRUE ) const;
-    INLINE const SwFmtFtnAtTxtEnd       &GetFtnAtTxtEnd( BOOL = TRUE ) const;
-    INLINE const SwFmtEndAtTxtEnd       &GetEndAtTxtEnd( BOOL = TRUE ) const;
-    INLINE const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
-    INLINE const SvxFrameDirectionItem  &GetFrmDir( BOOL = TRUE ) const;
-    INLINE const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
+    inline const SwFmtFillOrder         &GetFillOrder( BOOL = TRUE ) const;
+    inline const SwFmtFrmSize           &GetFrmSize( BOOL = TRUE ) const;
+    inline const SwFmtHeader            &GetHeader( BOOL = TRUE ) const;
+    inline const SwFmtFooter            &GetFooter( BOOL = TRUE ) const;
+    inline const SwFmtSurround          &GetSurround( BOOL = TRUE ) const;
+    inline const SwFmtHoriOrient        &GetHoriOrient( BOOL = TRUE ) const;
+    inline const SwFmtAnchor            &GetAnchor( BOOL = TRUE ) const;
+    inline const SwFmtCol               &GetCol( BOOL = TRUE ) const;
+    inline const SvxPaperBinItem        &GetPaperBin( BOOL = TRUE ) const;
+    inline const SvxLRSpaceItem         &GetLRSpace( BOOL = TRUE ) const;
+    inline const SvxULSpaceItem         &GetULSpace( BOOL = TRUE ) const;
+    inline const SwFmtCntnt             &GetCntnt( BOOL = TRUE ) const;
+    inline const SvxPrintItem           &GetPrint( BOOL = TRUE ) const;
+    inline const SvxOpaqueItem          &GetOpaque( BOOL = TRUE ) const;
+    inline const SvxProtectItem         &GetProtect( BOOL = TRUE ) const;
+    inline const SwFmtVertOrient        &GetVertOrient( BOOL = TRUE ) const;
+    inline const SvxBoxItem             &GetBox( BOOL = TRUE ) const;
+    inline const SvxFmtKeepItem         &GetKeep( BOOL = TRUE ) const;
+    inline const SvxBrushItem           &GetBackground( BOOL = TRUE ) const;
+    inline const SvxShadowItem          &GetShadow( BOOL = TRUE ) const;
+    inline const SwFmtPageDesc          &GetPageDesc( BOOL = TRUE ) const;
+    inline const SvxFmtBreakItem        &GetBreak( BOOL = TRUE ) const;
+    inline const SvxMacroItem           &GetMacro( BOOL = TRUE ) const;
+    inline const SwFmtURL               &GetURL( BOOL = TRUE ) const;
+    inline const SwFmtEditInReadonly    &GetEditInReadonly( BOOL = TRUE ) const;
+    inline const SwFmtLayoutSplit       &GetLayoutSplit( BOOL = TRUE ) const;
+    inline const SwFmtChain             &GetChain( BOOL = TRUE ) const;
+    inline const SwFmtLineNumber        &GetLineNumber( BOOL = TRUE ) const;
+    inline const SwFmtFtnAtTxtEnd       &GetFtnAtTxtEnd( BOOL = TRUE ) const;
+    inline const SwFmtEndAtTxtEnd       &GetEndAtTxtEnd( BOOL = TRUE ) const;
+    inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
+    inline const SvxFrameDirectionItem  &GetFrmDir( BOOL = TRUE ) const;
+    inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
 
     // Grafik-Attribute - impl. steht im grfatr.hxx
-    INLINE const SwMirrorGrf            &GetMirrorGrf( BOOL = TRUE ) const;
+    inline const SwMirrorGrf            &GetMirrorGrf( BOOL = TRUE ) const;
     inline const SwCropGrf              &GetCropGrf( BOOL = TRUE ) const;
     inline const SwRotationGrf          &GetRotationGrf(BOOL = TRUE ) const;
     inline const SwLuminanceGrf         &GetLuminanceGrf(BOOL = TRUE ) const;
@@ -272,9 +266,9 @@ public:
     inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
 
     // TabellenBox-Attribute    - impl. steht im cellatr.hxx
-    INLINE  const SwTblBoxNumFormat     &GetTblBoxNumFmt( BOOL = TRUE ) const;
-    INLINE  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
-    INLINE  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
+    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( BOOL = TRUE ) const;
+    inline  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
+    inline  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
 
     /** SwFmt::IsBackgroundTransparent - for feature #99657#
 
@@ -311,8 +305,6 @@ inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent,
     return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
-#undef INLINE
-
 } //namespace binfilter
 #endif // _FORMAT_HXX
 
diff --git a/binfilter/inc/bf_sw/frmatr.hxx b/binfilter/inc/bf_sw/frmatr.hxx
index b182ebc65..ee4f0454f 100644
--- a/binfilter/inc/bf_sw/frmatr.hxx
+++ b/binfilter/inc/bf_sw/frmatr.hxx
@@ -33,15 +33,10 @@
 #include <format.hxx>       //fuer Implementierung der inlines
 namespace binfilter {
 
-//------------------------ Inlines ---------------------------------
-
-
 /******************************************************************************
  *  Implementierung der FrameAttribut Methoden vom SwAttrSet
  ******************************************************************************/
 
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-// 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
@@ -101,8 +96,6 @@ inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
 inline const SvxFrameDirectionItem  &SwFmt::GetFrmDir(BOOL bInP) const
     { return aSet.GetFrmDir(bInP); }
 
-#endif
-
 } //namespace binfilter
 #endif //_FRMATR_HXX
 
diff --git a/binfilter/inc/bf_sw/grfatr.hxx b/binfilter/inc/bf_sw/grfatr.hxx
index b78866b90..7ae94e836 100644
--- a/binfilter/inc/bf_sw/grfatr.hxx
+++ b/binfilter/inc/bf_sw/grfatr.hxx
@@ -288,11 +288,8 @@ public:
  *  Implementierung der GrafikAttribut Methoden vom SwAttrSet
  ******************************************************************************/
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const
     { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); }
-#endif
 inline const SwCropGrf   &SwAttrSet::GetCropGrf(BOOL bInP) const
     { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); }
 inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const
@@ -320,11 +317,8 @@ inline const SwDrawModeGrf      &SwAttrSet::GetDrawModeGrf(BOOL bInP) const
  *  Implementierung der GrafikAttribut Methoden vom SwFmt
  ******************************************************************************/
 
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ) )
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const
     { return aSet.GetMirrorGrf(bInP); }
-#endif
 inline const SwCropGrf   &SwFmt::GetCropGrf(BOOL bInP) const
     { return aSet.GetCropGrf(bInP); }
 inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const
diff --git a/binfilter/inc/bf_sw/ndgrf.hxx b/binfilter/inc/bf_sw/ndgrf.hxx
index 4f57cd871..8a74bfa72 100644
--- a/binfilter/inc/bf_sw/ndgrf.hxx
+++ b/binfilter/inc/bf_sw/ndgrf.hxx
@@ -165,8 +165,6 @@ public:
 
 // ----------------------------------------------------------------------
 // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline       SwGrfNode   *SwNode::GetGrfNode()
 {
      return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0;
@@ -175,7 +173,6 @@ inline const SwGrfNode   *SwNode::GetGrfNode() const
 {
      return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0;
 }
-#endif
 
 #ifndef _FESHVIEW_ONLY_INLINE_NEEDED
 inline BOOL SwGrfNode::IsLinkedFile() const
diff --git a/binfilter/inc/bf_sw/ndnotxt.hxx b/binfilter/inc/bf_sw/ndnotxt.hxx
index c9b8edb80..6acb46c99 100644
--- a/binfilter/inc/bf_sw/ndnotxt.hxx
+++ b/binfilter/inc/bf_sw/ndnotxt.hxx
@@ -105,17 +105,15 @@ inline SwGrfFmtColl* SwNoTxtNode::GetGrfColl() const
 }
 
 // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline SwNoTxtNode *SwNode::GetNoTxtNode()
 {
     return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0;
 }
+
 inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
 {
     return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0;
 }
-#endif
 
 } //namespace binfilter
 #endif  // _NDNOTXT_HXX
diff --git a/binfilter/inc/bf_sw/ndole.hxx b/binfilter/inc/bf_sw/ndole.hxx
index ae006cc51..12411dab0 100644
--- a/binfilter/inc/bf_sw/ndole.hxx
+++ b/binfilter/inc/bf_sw/ndole.hxx
@@ -128,17 +128,15 @@ public:
 
 
 // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline SwOLENode *SwNode::GetOLENode()
 {
      return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0;
 }
+
 inline const SwOLENode *SwNode::GetOLENode() const
 {
      return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
 }
-#endif
 
 } //namespace binfilter
 #endif  // _NDOLE_HXX
diff --git a/binfilter/inc/bf_sw/ndtxt.hxx b/binfilter/inc/bf_sw/ndtxt.hxx
index f90463906..72643d761 100644
--- a/binfilter/inc/bf_sw/ndtxt.hxx
+++ b/binfilter/inc/bf_sw/ndtxt.hxx
@@ -276,7 +276,6 @@ public:
 
     // fuers Umhaengen der TxtFmtCollections (Outline-Nummerierung!!)
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-//  virtual BOOL GetInfo( SfxPoolItem& ) const;
 
     // aus SwIndexReg
     virtual void Update( const SwIndex & aPos, USHORT xub_StrLen,
@@ -317,18 +316,16 @@ inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
 // fuer den IBM-Compiler nicht inlinen wg. 42876
 #ifndef ICC
 // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
 inline       SwTxtNode   *SwNode::GetTxtNode()
 {
      return ND_TEXTNODE == nNodeType ? (SwTxtNode*)this : 0;
 }
+
 inline const SwTxtNode   *SwNode::GetTxtNode() const
 {
      return ND_TEXTNODE == nNodeType ? (const SwTxtNode*)this : 0;
 }
 #endif
-#endif
 
 inline void SwTxtNode::Cut(SwTxtNode *pDest, const SwIndex &rDestStart,
                             const SwIndex &rStart, xub_StrLen nLen)
diff --git a/binfilter/inc/bf_sw/node.hxx b/binfilter/inc/bf_sw/node.hxx
index ef687965c..facb77854 100644
--- a/binfilter/inc/bf_sw/node.hxx
+++ b/binfilter/inc/bf_sw/node.hxx
@@ -66,11 +66,7 @@ class SwPageDesc;
 class ViewShell;
 struct SwPosition;
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
 #define INLINE inline
-#endif
 
 // --------------------
 // class SwNode
diff --git a/binfilter/inc/bf_sw/swatrset.hxx b/binfilter/inc/bf_sw/swatrset.hxx
index 3f785c1ff..f14ba0c5f 100644
--- a/binfilter/inc/bf_sw/swatrset.hxx
+++ b/binfilter/inc/bf_sw/swatrset.hxx
@@ -141,12 +141,8 @@ class SwTblBoxFormula;
 class SwTblBoxValue;
 
 #ifndef INLINE
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
 #define INLINE inline
 #endif
-#endif
 
 class SwAttrPool : public SfxItemPool
 {
diff --git a/binfilter/inc/bf_sw/unotxdoc.hxx b/binfilter/inc/bf_sw/unotxdoc.hxx
index 3de78a1db..507f18110 100644
--- a/binfilter/inc/bf_sw/unotxdoc.hxx
+++ b/binfilter/inc/bf_sw/unotxdoc.hxx
@@ -72,8 +72,6 @@
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <RefreshListenerContainer.hxx>
 
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP Mac OS X internal compiler error; revisit with gcc3
 #define __IFC27 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
 Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27
 
@@ -108,7 +106,6 @@ public Ifc25, public Ifc26, public Ifc27
 #include <cppuhelper/implbase_ex_post.hxx>
 __DEF_IMPLHELPER_EX( 27 )
 
-#endif
 namespace binfilter {
 
 class SwDoc;
@@ -127,171 +124,6 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
  *
  ******************************************************************************/
 
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-// [ed] Explicit template instantiation to workaround compiler ICE
-
-namespace cppu
-{
-    struct ClassData27 : public ClassDataBase
-    {
-        Type_Offset arType2Offset[ 27 ];
-        ClassData27( ) SAL_THROW( () )
-            : ClassDataBase( 27 )
-            {}
-    };
-
-    class SAL_NO_VTABLE ImplHelperBase27
-        : public ::com::sun::star::lang::XTypeProvider
-        , public ::com::sun::star::text::XTextDocument, public ::com::sun::star::text::XLineNumberingProperties, public ::com::sun::star::text::XChapterNumberingSupplier, public ::com::sun::star::text::XFootnotesSupplier,
-public ::com::sun::star::text::XEndnotesSupplier, public ::com::sun::star::util::XReplaceable, public ::com::sun::star::text::XPagePrintable, public ::com::sun::star::text::XReferenceMarksSupplier, public ::com::sun::star::text::XTextTablesSupplier,
-public ::com::sun::star::text::XTextFramesSupplier, public ::com::sun::star::text::XBookmarksSupplier, public ::com::sun::star::text::XTextSectionsSupplier, public ::com::sun::star::text::XTextGraphicObjectsSupplier, public ::com::sun::star::text::XTextEmbeddedObjectsSupplier,
-public ::com::sun::star::text::XTextFieldsSupplier, public ::com::sun::star::style::XStyleFamiliesSupplier, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::drawing::XDrawPageSupplier, public ::com::sun::star::text::XDocumentIndexesSupplier,
-public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::document::XLinkTargetSupplier, public ::com::sun::star::document::XRedlinesSupplier, public ::com::sun::star::util::XRefreshable,
-public ::com::sun::star::util::XLinkUpdate, public ::com::sun::star::lang::XUnoTunnel, public ::com::sun::star::view::XRenderable
-    {
-    protected:
-        ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () )
-            {
-                ClassData & rCD = * static_cast< ClassData * >( &s_aCD );
-                if (! rCD.bOffsetsInit)
-                {
-                    ::osl::MutexGuard aGuard( getImplHelperInitMutex() );
-                    if (! rCD.bOffsetsInit)
-                    {
-                        char * pBase = (char *)this;
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextDocument *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XLineNumberingProperties > *)0 ),
-                                             (char *)(::com::sun::star::text::XLineNumberingProperties *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XChapterNumberingSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XChapterNumberingSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnotesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XFootnotesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XEndnotesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XEndnotesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceable > *)0 ),
-                                             (char *)(::com::sun::star::util::XReplaceable *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XPagePrintable > *)0 ),
-                                             (char *)(::com::sun::star::text::XPagePrintable *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XReferenceMarksSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XReferenceMarksSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTablesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextTablesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFramesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextFramesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XBookmarksSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XBookmarksSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSectionsSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextSectionsSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextGraphicObjectsSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextGraphicObjectsSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextEmbeddedObjectsSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextEmbeddedObjectsSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFieldsSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XTextFieldsSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyleFamiliesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::style::XStyleFamiliesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ),
-                                             (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPageSupplier > *)0 ),
-                                             (char *)(::com::sun::star::drawing::XDrawPageSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndexesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::text::XDocumentIndexesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
-                                             (char *)(::com::sun::star::beans::XPropertySet *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ),
-                                             (char *)(::com::sun::star::beans::XPropertyState *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XLinkTargetSupplier > *)0 ),
-                                             (char *)(::com::sun::star::document::XLinkTargetSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XRedlinesSupplier > *)0 ),
-                                             (char *)(::com::sun::star::document::XRedlinesSupplier *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > *)0 ),
-                                             (char *)(::com::sun::star::util::XRefreshable *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XLinkUpdate > *)0 ),
-                                             (char *)(::com::sun::star::util::XLinkUpdate *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ),
-                                             (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase );
-                        rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::view::XRenderable > *)0 ),
-                                             (char *)(::com::sun::star::view::XRenderable *)this - pBase );
-                        rCD.bOffsetsInit = sal_True;
-                    }
-                }
-                return rCD;
-            }
-    };
-
-
-    class SAL_NO_VTABLE ImplHelper27
-        : public ImplHelperBase27
-    {
-        static ClassData27 s_aCD;
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getTypes(); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getImplementationId(); }
-    };
-
-    class SAL_NO_VTABLE WeakImplHelper27
-        : public ::cppu::OWeakObject
-        , public ImplHelperBase27
-    {
-        static ClassData27 s_aCD;
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            {
-                ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ) );
-                return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getTypes(); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getImplementationId(); }
-    };
-
-    class SAL_NO_VTABLE WeakAggImplHelper27
-        : public ::cppu::OWeakAggObject
-        , public ImplHelperBase27
-    {
-        static ClassData27 s_aCD;
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return OWeakAggObject::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
-            {
-                ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ) );
-                return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType ));
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakAggObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakAggObject::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getTypes(); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return getClassData( s_aCD ).getImplementationId(); }
-    };
-
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    ClassData12 ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 0 );
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    ClassData12 WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 1 );
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    ClassData12 WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 2 );
-#endif
-
-}
-
-typedef cppu::WeakImplHelper27 SwXTextDocumentBaseClass;
-#else
-
 typedef cppu::WeakImplHelper27
 <
     ::com::sun::star::text::XTextDocument,
@@ -324,7 +156,6 @@ typedef cppu::WeakImplHelper27
 >
 SwXTextDocumentBaseClass;
 
-#endif /* MACOSX */
 class SwXTextDocument : public SwXTextDocumentBaseClass,
     public SvxFmMSFactory,
     public SfxBaseModel
@@ -353,7 +184,6 @@ class SwXTextDocument : public SwXTextDocumentBaseClass,
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFieldMasters;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextSections;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXBookmarks;
-//  ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXTextShapes;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextTables;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFrames;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXGraphicObjects;
diff --git a/binfilter/inc/bf_xmloff/txtimp.hxx b/binfilter/inc/bf_xmloff/txtimp.hxx
index d19ba1ba5..9d5fd8ece 100644
--- a/binfilter/inc/bf_xmloff/txtimp.hxx
+++ b/binfilter/inc/bf_xmloff/txtimp.hxx
@@ -452,15 +452,9 @@ protected:
 
     // access, lazy initialization and destruction of backpatchers
     // Code is implemented in XMLPropertyBackpatcher.cxx
-#if     !(defined(MACOSX) && (__GNUC__ < 3))
     inline XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP();
     inline XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP();
     inline XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP();
-#else
-    XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP();
-    XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP();
-    XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP();
-#endif
 
 public: