From 92c4e2c179a3f6ec24534bf3fb9d4d5a25bfd9cd Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 23 Aug 2002 14:52:56 +0000 Subject: #101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.6-1.6.10.2) -> HEAD --- sw/inc/unotxdoc.hxx | 193 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 171 insertions(+), 22 deletions(-) (limited to 'sw/inc/unotxdoc.hxx') diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 8d5b0ee61c47..d30a7150947d 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unotxdoc.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dbo $ $Date: 2001-09-05 09:04:36 $ + * last change: $Author: hr $ $Date: 2002-08-23 15:52:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -182,6 +182,8 @@ #include #endif +#ifndef MACOSX +// GrP Mac OS X internal compiler error; revisit with gcc3 #define __IFC26 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \ Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26 @@ -195,24 +197,6 @@ public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23 , public Ifc24, \ public Ifc25, public Ifc26 -#ifdef MACOSX /* use old impl helpers for macosx */ - -#ifndef _CPPUHELPER_IMPLBASE_HXX_ -#include -#endif - -__DEF_IMPLHELPER_PRE( 26 ) - __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) __IFC_WRITEOFFSET( 3 ) __IFC_WRITEOFFSET( 4 ) - __IFC_WRITEOFFSET( 5 ) __IFC_WRITEOFFSET( 6 ) __IFC_WRITEOFFSET( 7 ) __IFC_WRITEOFFSET( 8 ) - __IFC_WRITEOFFSET( 9 ) __IFC_WRITEOFFSET( 10) __IFC_WRITEOFFSET( 11) __IFC_WRITEOFFSET( 12) - __IFC_WRITEOFFSET( 13) __IFC_WRITEOFFSET( 14) __IFC_WRITEOFFSET( 15) __IFC_WRITEOFFSET( 16) - __IFC_WRITEOFFSET( 17) __IFC_WRITEOFFSET( 18) __IFC_WRITEOFFSET( 19) __IFC_WRITEOFFSET( 20) - __IFC_WRITEOFFSET( 21) __IFC_WRITEOFFSET( 22) __IFC_WRITEOFFSET( 23) __IFC_WRITEOFFSET( 24) - __IFC_WRITEOFFSET( 25) __IFC_WRITEOFFSET( 26) -__DEF_IMPLHELPER_POST( 26 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_IMPLBASE_EX_HXX_ #include #endif @@ -239,8 +223,7 @@ __DEF_IMPLHELPER_POST( 26 ) #endif __DEF_IMPLHELPER_EX( 26 ) -#endif /* MACOSX */ - +#endif class SwDoc; class SvxForbiddenCharactersTable; @@ -257,6 +240,170 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4); /****************************************************************************** * ******************************************************************************/ + +#ifdef MACOSX +// [ed] Explicit template instantiation to workaround compiler ICE + +namespace cppu +{ + struct ClassData26 : public ClassDataBase + { + Type_Offset arType2Offset[ 26 ]; + ClassData26( ) SAL_THROW( () ) + : ClassDataBase( 26 ) + {} + }; + + class SAL_NO_VTABLE ImplHelperBase26 + : public ::com::sun::star::lang::XTypeProvider + , public ::com::sun::star::text::XTextDocument, public ::com::sun::star::text::XLineNumberingProperties, public ::com::sun::star::text::XChapterNumberingSupplier, public ::com::sun::star::text::XFootnotesSupplier, +public ::com::sun::star::text::XEndnotesSupplier, public ::com::sun::star::util::XReplaceable, public ::com::sun::star::text::XPagePrintable, public ::com::sun::star::text::XReferenceMarksSupplier, public ::com::sun::star::text::XTextTablesSupplier, +public ::com::sun::star::text::XTextFramesSupplier, public ::com::sun::star::text::XBookmarksSupplier, public ::com::sun::star::text::XTextSectionsSupplier, public ::com::sun::star::text::XTextGraphicObjectsSupplier, public ::com::sun::star::text::XTextEmbeddedObjectsSupplier, +public ::com::sun::star::text::XTextFieldsSupplier, public ::com::sun::star::style::XStyleFamiliesSupplier, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::drawing::XDrawPageSupplier, public ::com::sun::star::text::XDocumentIndexesSupplier, +public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::document::XLinkTargetSupplier, public ::com::sun::star::document::XRedlinesSupplier, public ::com::sun::star::util::XRefreshable, +public ::com::sun::star::util::XLinkUpdate, public ::com::sun::star::lang::XUnoTunnel + { + protected: + ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () ) + { + ClassData & rCD = * static_cast< ClassData * >( &s_aCD ); + if (! rCD.bOffsetsInit) + { + ::osl::MutexGuard aGuard( getImplHelperInitMutex() ); + if (! rCD.bOffsetsInit) + { + char * pBase = (char *)this; + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > *)0 ), + (char *)(::com::sun::star::text::XTextDocument *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XLineNumberingProperties > *)0 ), + (char *)(::com::sun::star::text::XLineNumberingProperties *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XChapterNumberingSupplier > *)0 ), + (char *)(::com::sun::star::text::XChapterNumberingSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnotesSupplier > *)0 ), + (char *)(::com::sun::star::text::XFootnotesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XEndnotesSupplier > *)0 ), + (char *)(::com::sun::star::text::XEndnotesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceable > *)0 ), + (char *)(::com::sun::star::util::XReplaceable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XPagePrintable > *)0 ), + (char *)(::com::sun::star::text::XPagePrintable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XReferenceMarksSupplier > *)0 ), + (char *)(::com::sun::star::text::XReferenceMarksSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTablesSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextTablesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFramesSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextFramesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XBookmarksSupplier > *)0 ), + (char *)(::com::sun::star::text::XBookmarksSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSectionsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextSectionsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextGraphicObjectsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextGraphicObjectsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextEmbeddedObjectsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextEmbeddedObjectsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFieldsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextFieldsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyleFamiliesSupplier > *)0 ), + (char *)(::com::sun::star::style::XStyleFamiliesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ), + (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPageSupplier > *)0 ), + (char *)(::com::sun::star::drawing::XDrawPageSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndexesSupplier > *)0 ), + (char *)(::com::sun::star::text::XDocumentIndexesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ), + (char *)(::com::sun::star::beans::XPropertySet *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ), + (char *)(::com::sun::star::beans::XPropertyState *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XLinkTargetSupplier > *)0 ), + (char *)(::com::sun::star::document::XLinkTargetSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XRedlinesSupplier > *)0 ), + (char *)(::com::sun::star::document::XRedlinesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > *)0 ), + (char *)(::com::sun::star::util::XRefreshable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XLinkUpdate > *)0 ), + (char *)(::com::sun::star::util::XLinkUpdate *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ), + (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase ); + rCD.bOffsetsInit = sal_True; + } + } + return rCD; + } + }; + + + class SAL_NO_VTABLE ImplHelper26 + : public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + + class SAL_NO_VTABLE WeakImplHelper26 + : public ::cppu::OWeakObject + , public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { + ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ) ); + return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); + } + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + + class SAL_NO_VTABLE WeakAggImplHelper26 + : public ::cppu::OWeakAggObject + , public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { return OWeakAggObject::queryInterface( rType ); } + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { + ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ) ); + return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); + } + virtual void SAL_CALL acquire() throw () + { OWeakAggObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakAggObject::release(); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + +#ifndef MACOSX + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 0 ); + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 1 ); + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 2 ); +#endif + +} + +typedef cppu::WeakImplHelper26 SwXTextDocumentBaseClass; +#else + typedef cppu::WeakImplHelper26 < ::com::sun::star::text::XTextDocument, @@ -287,6 +434,8 @@ typedef cppu::WeakImplHelper26 ::com::sun::star::lang::XUnoTunnel > SwXTextDocumentBaseClass; + +#endif /* MACOSX */ class SwXTextDocument : public SwXTextDocumentBaseClass, public SvxFmMSFactory, public SfxBaseModel -- cgit