diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:58:20 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:58:20 +0000 |
| commit | 5fd047f183173ff03100a62fe9085a29c033cb28 (patch) | |
| tree | 2254a2e78addca72e09091eafc6c210f0bfcf04e /io | |
| parent | 458dea46957b826e4baf34ce83ad0e0fec4218ad (diff) | |
INTEGRATION: CWS geordi2q01 (1.13.18); FILE MERGED
2003/08/18 12:57:59 hr 1.13.18.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/acceptor/acceptor.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index b73760eadb77..9f7087c5a8ce 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acceptor.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2003-04-15 15:57:58 $ + * last change: $Author: hjs $ $Date: 2003-08-18 14:58:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::connection; -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) ClassData2 cppu::WeakImplHelper2<com::sun::star::connection::XAcceptor, com::sun::star::lang::XServiceInfo>::s_aCD(1); /*ClassData1 cppu::WeakImplHelper1<com::sun::star::connection::XConnection>::s_aCD(1); ClassData2 cppu::WeakImplHelper2<com::sun::star::connection::XConnection, com::sun::star::connection::XConnectionBroadcaster>::s_aCD(1);*/ |