INTEGRATION: CWS geordi2q14 (1.3.76); FILE MERGED

2004/01/29 16:05:37 hr 1.3.76.1: #111934#: merge CWS ooo111fix2

framework/source/classes/rootactiontriggercontainer.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rootactiontriggercontainer.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-07-16 17:40:03 $
+ *  last change: $Author: hr $ $Date: 2004-02-02 23:05:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,19 +90,10 @@ using namespace com::sun::star::beans;
 namespace framework
 {
 
-//MACOSX moved outside of class above
-#if defined(MACOSX) && (__GNUC__ < 3)
-    static sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
-    static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
-#endif
-
 static Sequence< sal_Int8 > impl_getStaticIdentifier()
 {
-#if !(defined(MACOSX) && (__GNUC__ < 3))
-    //MACOSX moved outside of class above
     static sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
-#endif
     return seqID ;
 }