Index: source/editeng/editundo.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/editundo.hxx,v
retrieving revision 1.3
diff -u -r1.3 editundo.hxx
--- source/editeng/editundo.hxx	20 Aug 2002 11:14:24 -0000	1.3
+++ source/editeng/editundo.hxx	14 Jul 2003 13:08:56 -0000
@@ -182,14 +182,14 @@
 					TYPEINFO();
 					EditUndoRemoveChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr );
 
-#ifndef MACOSX
-	const EPaM&		GetEPaM() { return aEPaM; }
-	String&			GetStr() { return aText; }
-#else
+#if defined(MACOSX) && ( __GNUC__ < 3 )
         // implementations moved to impedit2.cxx
         // fixme revisit after gcc3
 	const EPaM&		GetEPaM();
 	String&			GetStr();
+#else
+	const EPaM&		GetEPaM() { return aEPaM; }
+	String&			GetStr() { return aText; }
 #endif
 
 	virtual void 	Undo();
Index: source/editeng/impedit2.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/impedit2.cxx,v
retrieving revision 1.86
diff -u -r1.86 impedit2.cxx
--- source/editeng/impedit2.cxx	12 Jun 2003 08:23:48 -0000	1.86
+++ source/editeng/impedit2.cxx	14 Jul 2003 13:08:59 -0000
@@ -133,7 +133,7 @@
 
 #include <unicode/ubidi.h>
 
-#ifdef MACOSX
+#if defined(MACOSX) && ( __GNUC__ < 3 )
 // moved from editundo.hxx
 const EPaM& EditUndoRemoveChars::GetEPaM() { return aEPaM; }
 String& EditUndoRemoveChars::GetStr() { return aText; }
Index: source/fmcomp/fmgridif.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/fmcomp/fmgridif.cxx,v
retrieving revision 1.36.12.1
diff -u -r1.36.12.1 fmgridif.cxx
--- source/fmcomp/fmgridif.cxx	24 Jun 2003 15:21:37 -0000	1.36.12.1
+++ source/fmcomp/fmgridif.cxx	14 Jul 2003 13:09:02 -0000
@@ -179,7 +179,7 @@
 // keep it that way!
 
 using namespace ::svxform;
-#ifndef MACOSX
+#if ! (defined(MACOSX) && ( __GNUC__ < 3 ) )
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sdbc;
 #endif
@@ -187,13 +187,13 @@
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
-#ifndef MACOSX
+#if ! (defined(MACOSX) && ( __GNUC__ < 3 ) )
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star;
 #endif
 using namespace ::com::sun::star::util;
 
-#ifdef MACOSX
+#if defined(MACOSX) && ( __GNUC__ < 3 ) 
 	#define XContainerListener ::com::sun::star::container::XContainerListener
 	#define ContainerEvent ::com::sun::star::container::ContainerEvent
 	#define XIndexContainer ::com::sun::star::container::XIndexContainer
@@ -354,11 +354,11 @@
 	aMulti.Source = &m_rParent;
 
 	sal_Bool bResult = sal_True;
-	if (getLength())											\
-	{																	\
-		::cppu::OInterfaceIteratorHelper aIter(*this);				\
-		while (bResult && aIter.hasMoreElements())									\
-			bResult = reinterpret_cast< XUpdateListener*>(aIter.next())->approveUpdate(aMulti);		\
+	if (getLength())
+	{
+		::cppu::OInterfaceIteratorHelper aIter(*this);
+		while (bResult && aIter.hasMoreElements())
+			bResult = reinterpret_cast< XUpdateListener*>(aIter.next())->approveUpdate(aMulti);
 	}
 
 	return bResult;