diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:05:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:05:59 +0000 |
| commit | f962cc2273a034ffbc4035a04109d79db977eab9 (patch) | |
| tree | fba92852b10fab1c740308e89f0ab1ee21d81097 | |
| parent | 6cea9972e83d3b4398da395c7ca83e5392cfe315 (diff) | |
INTEGRATION: CWS geordi2q14 (1.3.76); FILE MERGED
2004/01/29 16:05:37 hr 1.3.76.1: #111934#: merge CWS ooo111fix2
| -rw-r--r-- | framework/source/classes/rootactiontriggercontainer.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx index 7a3e3fc1ce8f..26b938291b2f 100644 --- a/framework/source/classes/rootactiontriggercontainer.cxx +++ b/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 ; } |