diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:10:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:10:35 +0000 |
| commit | ca6bac462f45aca4d2ad7140e82e880a2884a474 (patch) | |
| tree | 83411722c00f9af9ec801604ea6a0e57333b1fd3 /bridges/inc | |
| parent | d84423b4f480e1d4cc57194632d47e0db742b648 (diff) | |
INTEGRATION: CWS geordi2q14 (1.13.16); FILE MERGED
2004/01/29 12:16:36 hr 1.13.16.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'bridges/inc')
| -rw-r--r-- | bridges/inc/bridges/cpp_uno/bridge.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 19f8cc1e9d92..62f4c344bf4d 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bridge.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2003-10-06 13:15:01 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:10:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -438,7 +438,7 @@ inline void SAL_CALL cppu_ext_getMapping( //################################################################################################## //################################################################################################## -#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)) +#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) static ::rtl::OUString * s_pStaticOidPart = 0; #endif @@ -446,7 +446,7 @@ static ::rtl::OUString * s_pStaticOidPart = 0; //-------------------------------------------------------------------------------------------------- inline const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW( () ) { -#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))) +#if ! (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) static ::rtl::OUString * s_pStaticOidPart = 0; #endif if (! s_pStaticOidPart) @@ -463,7 +463,7 @@ inline const ::rtl::OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW { aRet.append( (sal_Int32)ar[i], 16 ); } -#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)) +#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) s_pStaticOidPart = new ::rtl::OUString( aRet.makeStringAndClear() ); #else static ::rtl::OUString s_aStaticOidPart( aRet.makeStringAndClear() ); |