From fa404a5f05b5b589915a16db50126418cdf908a6 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 15 Aug 2002 11:33:12 +0000 Subject: #101685#,#i6886# merge OOO_STABLE_1_PORTS (1.6-1.6.10.1) -> HEAD --- cppuhelper/source/implbase.cxx | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'cppuhelper/source/implbase.cxx') diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 5d5d64357ad9..c65720f42aec 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dbo $ $Date: 2002-07-10 15:20:59 $ + * last change: $Author: hr $ $Date: 2002-08-15 12:33:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,33 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +#include +#include +#include +#include +#include +#include +#include +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +#endif + namespace cppu { //================================================================================================== -- cgit