INTEGRATION: CWS geordi2q14 (1.2.76); FILE MERGED

2004/01/29 16:05:34 hr 1.2.76.1: #111934#: merge CWS ooo111fix2

framework/source/classes/imagewrapper.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagewrapper.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2003-07-16 17:39:54 $
+ *  last change: $Author: hr $ $Date: 2004-02-02 23:05:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,19 +92,10 @@ using namespace com::sun::star::uno;
 namespace framework
 {
 
-//MACOSX moved outside of class above
-#if defined(MACOSX) && (__GNUC__ < 3)
-    static sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 };
-    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] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 };
     static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((sal_Int8*)pGUID,16) ;
-#endif
     return seqID ;
 }