diff options
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 12 | ||||
| -rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 10 | ||||
| -rw-r--r-- | io/source/TextInputStream/makefile.mk | 5 | ||||
| -rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 7 | ||||
| -rw-r--r-- | io/source/acceptor/acceptor.cxx | 9 | ||||
| -rw-r--r-- | io/source/acceptor/makefile.mk | 8 | ||||
| -rw-r--r-- | io/source/connector/connector.cxx | 10 |
7 files changed, 47 insertions, 14 deletions
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 9af1874d3c27..1c71716f8000 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -2,9 +2,9 @@ * * $RCSfile: macro_expander.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dbo $ $Date: 2002-06-14 13:20:19 $ + * last change: $Author: vg $ $Date: 2002-09-05 16:13:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,9 @@ #include <rtl/bootstrap.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/compbase3.hxx> +#include <cppuhelper/component_context.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -110,6 +112,12 @@ static Sequence< OUString > const & s_get_service_names() typedef ::cppu::WeakComponentImplHelper3< util::XMacroExpander, lang::XServiceInfo, lang::XInitialization > t_uno_impl; +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic + +cppu::ClassData3 cppu::WeakComponentImplHelper3< com::sun::star::util::XMacroExpander, com::sun::star::lang::XServiceInfo, com::sun::star::lang::XInitialization >::s_aCD(1); +#endif + struct mutex_holder { Mutex m_mutex; diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 58e32ca89ecd..780897cf97ea 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TextInputStream.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2001-09-21 15:25:56 $ + * last change: $Author: vg $ $Date: 2002-09-05 16:10:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::registry; +#ifdef MACOSX +#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp> + +ClassData3 cppu::WeakImplHelper3<com::sun::star::io::XTextInputStream, com::sun::star::io::XActiveDataSink, com::sun::star::lang::XServiceInfo>::s_aCD(1); +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence<unsigned short>::s_pType; +#endif namespace io_TextInputStream { diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk index 1b9f54ee8bdb..76b6202a921a 100644 --- a/io/source/TextInputStream/makefile.mk +++ b/io/source/TextInputStream/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: jbu $ $Date: 2001-06-29 16:44:02 $ +# last change: $Author: vg $ $Date: 2002-09-05 16:11:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,6 +86,7 @@ UNOTYPES= com.sun.star.io.XTextInputStream \ com.sun.star.lang.XTypeProvider \ com.sun.star.lang.XServiceInfo \ com.sun.star.registry.XRegistryKey \ + com.sun.star.reflection.XInterfaceMemberTypeDescription \ com.sun.star.uno.XAggregation \ com.sun.star.uno.XWeak \ com.sun.star.uno.XComponentContext diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 96a6b7218758..05f5a6f82456 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TextOutputStream.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2001-09-21 15:26:46 $ + * last change: $Author: vg $ $Date: 2002-09-05 16:07:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,6 +89,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::registry; +#ifdef MACOSX +ClassData3 cppu::WeakImplHelper3<com::sun::star::io::XTextOutputStream, com::sun::star::io::XActiveDataSource, com::sun::star::lang::XServiceInfo>::s_aCD(1); +#endif namespace io_TextOutputStream { diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index c0a26fc8e076..8720a9192f2a 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acceptor.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2001-09-21 15:24:46 $ + * last change: $Author: vg $ $Date: 2002-09-05 16:08:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,11 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::connection; +#ifdef MACOSX +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);*/ +#endif namespace io_acceptor { diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index 139d69b85ece..596ded68cdd0 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: jbu $ $Date: 2001-06-22 16:32:55 $ +# last change: $Author: vg $ $Date: 2002-09-05 16:09:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -94,6 +94,10 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS+= -lconnectr +.ENDIF + SHL1DEPN= SHL1IMPLIB= i$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 8315dc077423..c3fc8c5ac7ae 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -2,9 +2,9 @@ * * $RCSfile: connector.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2001-09-21 15:24:04 $ + * last change: $Author: vg $ $Date: 2002-09-05 16:12:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::connection; +#ifdef MACOSX +ClassData2 WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster >::s_aCD(1); +ClassData2 WeakImplHelper2<com::sun::star::connection::XConnector, com::sun::star::lang::XServiceInfo>::s_aCD(1); +ClassData1 WeakImplHelper1<com::sun::star::connection::XConnection>::s_aCD(1); +#endif + namespace stoc_connector { rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; |