Submitted By: DJ Lucas Date: 2005-04-27 Origin: Gentoo Initial Package Version: 1.1.3 Description: Fixes build issues with gcc-3.4.2+. $LastChangedBy: bdubbs $ $Date: 2005-08-01 13:29:19 -0600 (Mon, 01 Aug 2005) $ diff -Naur OOo-build-orig/autodoc/source/ary/cpp/c_gate.cxx OOo-build/autodoc/source/ary/cpp/c_gate.cxx --- OOo-build-orig/autodoc/source/ary/cpp/c_gate.cxx 2003-06-30 10:25:45.000000000 -0500 +++ OOo-build/autodoc/source/ary/cpp/c_gate.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -744,7 +744,8 @@ while ( true ) { int nUse = -1; - for ( int i = 0; i < 5; ++i ) + int i; + for ( i = 0; i < 5; ++i ) { if ( it[i] != itEnd[i] ) { diff -Naur OOo-build-orig/autodoc/source/ary/cpp/prpr.cxx OOo-build/autodoc/source/ary/cpp/prpr.cxx --- OOo-build-orig/autodoc/source/ary/cpp/prpr.cxx 2002-03-08 08:45:18.000000000 -0600 +++ OOo-build/autodoc/source/ary/cpp/prpr.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -92,7 +92,8 @@ { if ( io_bConcatenate ) { - for ( uintt nPos = o_rText.tellp() - 1; + uintt nPos; + for ( nPos = o_rText.tellp() - 1; nPos > 0 ? o_rText.c_str()[nPos] == ' ' : false; --nPos ); o_rText.seekp(nPos+1); diff -Naur OOo-build-orig/autodoc/source/ary/inc/nametreenode.hxx OOo-build/autodoc/source/ary/inc/nametreenode.hxx --- OOo-build-orig/autodoc/source/ary/inc/nametreenode.hxx 2003-03-18 08:11:34.000000000 -0600 +++ OOo-build/autodoc/source/ary/inc/nametreenode.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -187,7 +187,7 @@ NameTreeNode::Add_Name( const String & i_sName, item_id i_nId ) { - LocalNames().insert( Map_LocalNames::value_type(i_sName, i_nId) ); + LocalNames().insert( typename Map_LocalNames::value_type(i_sName, i_nId) ); } diff -Naur OOo-build-orig/autodoc/source/ary/inc/store/st_iterator.hxx OOo-build/autodoc/source/ary/inc/store/st_iterator.hxx --- OOo-build-orig/autodoc/source/ary/inc/store/st_iterator.hxx 2002-11-01 11:13:57.000000000 -0600 +++ OOo-build/autodoc/source/ary/inc/store/st_iterator.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -244,7 +244,7 @@ const unit_type & operator*() const /// @precond bool(*this); - { return CurUnit(); } + { return RootConstIterator::CurUnit(); } }; @@ -271,7 +271,7 @@ { } unit_type & operator*() const /// @precond bool(*this); - { return CurUnit(); } + { return RootIterator::CurUnit(); } }; @@ -279,6 +279,7 @@ class RootFilterConstIterator : public internal::IteratorBase< UNIT, FILTER > { public: + typedef UNIT unit_type; typedef RootFilterConstIterator self; RootFilterConstIterator( @@ -290,7 +291,7 @@ i_rOther.CurPosition() ) {} const unit_type & operator*() const /// @precond bool(*this); - { return CurUnit(); } + { return RootFilterConstIterator::CurUnit(); } self & operator=( const RootConstIterator & i_rOther ) @@ -307,6 +308,9 @@ class RootFilterIterator : public internal::IteratorBase< UNIT, FILTER > { public: + typedef UNIT unit_type; + typedef RootFilterIterator self; + RootFilterIterator( const RootIterator & i_rOther ) @@ -317,7 +321,7 @@ unit_type & operator*() const /// @precond bool(*this); - { return CurUnit(); } + { return RootFilterIterator::CurUnit(); } self & operator=( const RootIterator & i_rOther ) diff -Naur OOo-build-orig/autodoc/source/ary/store/t_storg.hxx OOo-build/autodoc/source/ary/store/t_storg.hxx --- OOo-build-orig/autodoc/source/ary/store/t_storg.hxx 2003-07-02 08:49:27.000000000 -0500 +++ OOo-build/autodoc/source/ary/store/t_storg.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -131,8 +131,8 @@ StdReStorage::do_Add( const KEY & i_rKey, DYN RE & let_drElement ) { - std::pair result - = aDataBase.insert(DataBase::value_type(i_rKey, &let_drElement)); + std::pair result; + result = aDataBase.insert(typename DataBase::value_type(i_rKey, &let_drElement)); if (result.second == false) delete &let_drElement; return *(*result.first).second; diff -Naur OOo-build-orig/autodoc/source/ary/store/ti_storg.hxx OOo-build/autodoc/source/ary/store/ti_storg.hxx --- OOo-build-orig/autodoc/source/ary/store/ti_storg.hxx 2002-03-08 08:45:20.000000000 -0600 +++ OOo-build/autodoc/source/ary/store/ti_storg.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -124,7 +124,7 @@ template inline const RE & ReStorage::operator[]( const KEY & i_rKey ) const - { const RE * ret = inq_Find(i_rKey); + { const RE * ret = ReStorage::inq_Find(i_rKey); csv_assert(ret != 0); return *ret; } diff -Naur OOo-build-orig/autodoc/source/display/html/hdimpl.cxx OOo-build/autodoc/source/display/html/hdimpl.cxx --- OOo-build-orig/autodoc/source/display/html/hdimpl.cxx 2003-03-18 08:11:36.000000000 -0600 +++ OOo-build/autodoc/source/display/html/hdimpl.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -457,7 +457,8 @@ { if ( *io_rStr.c_str() < 33 AND io_rStr.length() > 0 ) { - for ( const unsigned char * pNew = (const unsigned char * ) io_rStr.c_str(); + const unsigned char * pNew; + for ( pNew = (const unsigned char * ) io_rStr.c_str(); *pNew < 33 AND *pNew != 0; ++pNew ) {} udmstri sNew( (const char*)pNew ); diff -Naur OOo-build-orig/autodoc/source/display/toolkit/out_position.cxx OOo-build/autodoc/source/display/toolkit/out_position.cxx --- OOo-build-orig/autodoc/source/display/toolkit/out_position.cxx 2002-11-01 11:15:27.000000000 -0600 +++ OOo-build/autodoc/source/display/toolkit/out_position.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -241,13 +241,15 @@ const char * get_UpLink(intt i_depth) { + intt nDepth; + if ( i_depth <= C_nMaxDepth ) return C_sUpLink + 3*(C_nMaxDepth - i_depth); StreamLock aRet(i_depth*3 + 1); StreamStr & rRet = aRet(); - for ( intt nDepth = i_depth; nDepth > C_nMaxDepth; nDepth -= C_nMaxDepth ) + for ( nDepth = i_depth; nDepth > C_nMaxDepth; nDepth -= C_nMaxDepth ) { rRet << C_sUpLink; } diff -Naur OOo-build-orig/autodoc/source/inc/estack.hxx OOo-build/autodoc/source/inc/estack.hxx --- OOo-build-orig/autodoc/source/inc/estack.hxx 2003-06-30 10:27:34.000000000 -0500 +++ OOo-build/autodoc/source/inc/estack.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -98,11 +98,11 @@ bool operator==( const EStack & i_r2 ) const - { return std::operator==( Base(), i_rStack.Base() ); } + { return std::operator==( Base(), EStack::i_rStack.Base() ); } bool operator<( const EStack & i_r2 ) const - { return std::operator<( Base(), i_rStack.Base() ); } + { return std::operator<( Base(), EStack::i_rStack.Base() ); } // OPERATIONS void push( const value_type & i_rElem ) diff -Naur OOo-build-orig/autodoc/source/parser/cpp/cx_c_pp.cxx OOo-build/autodoc/source/parser/cpp/cx_c_pp.cxx --- OOo-build-orig/autodoc/source/parser/cpp/cx_c_pp.cxx 2003-03-18 08:11:41.000000000 -0600 +++ OOo-build/autodoc/source/parser/cpp/cx_c_pp.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -175,6 +175,8 @@ void Context_PP_MacroParams::ReadCharChain( CharacterSource & io_rText ) { + uintt nLen; + jumpOverWhite( io_rText ); // KORR_FUTURE Handling line breaks within macro parameters: char cSeparator = jumpTo( io_rText, ',', ')' ); @@ -183,7 +185,7 @@ static char cBuf[500]; // KORR_FUTURE, make it still safer, here: strcpy( cBuf, io_rText.CutToken() ); // SAFE STRCPY (#100211# - checked) - for ( uintt nLen = strlen(cBuf); + for ( nLen = strlen(cBuf); nLen > 0 AND cBuf[nLen-1] < 33; --nLen ) { } diff -Naur OOo-build-orig/automation/source/server/statemnt.hxx OOo-build/automation/source/server/statemnt.hxx --- OOo-build-orig/automation/source/server/statemnt.hxx 2003-06-10 06:29:57.000000000 -0500 +++ OOo-build/automation/source/server/statemnt.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -351,7 +351,7 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, resetaplication ...) { - friend ImplRemoteControl; + friend class ImplRemoteControl; protected: USHORT nMethodId; USHORT nParams; diff -Naur OOo-build-orig/basic/inc/sbdef.hxx OOo-build/basic/inc/sbdef.hxx --- OOo-build-orig/basic/inc/sbdef.hxx 2004-10-12 05:56:33.000000000 -0500 +++ OOo-build/basic/inc/sbdef.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -77,7 +77,8 @@ SB_STRING, // Strings SB_NUMBER, // Zahlen SB_PUNCTUATION, // Klammern, Punkte etc - SB_COMMENT // Kommentare + SB_COMMENT, // Kommentare + SB_DUMMY = 255 }; enum SbLanguageMode { // Aktive Sprache diff -Naur OOo-build-orig/basic/source/app/appwin.hxx OOo-build/basic/source/app/appwin.hxx --- OOo-build-orig/basic/source/app/appwin.hxx 2002-03-28 08:43:03.000000000 -0600 +++ OOo-build/basic/source/app/appwin.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -101,7 +101,7 @@ class AppWin : public DockingWindow, public SfxListener // Dokumentfenster { - friend MsgEdit; + friend class MsgEdit; protected: static short nNumber; // fortlaufende Nummer static short nCount; // Anzahl Editfenster diff -Naur OOo-build-orig/basic/source/app/comm_bas.cxx OOo-build/basic/source/app/comm_bas.cxx --- OOo-build-orig/basic/source/app/comm_bas.cxx 2000-09-18 11:12:08.000000000 -0500 +++ OOo-build/basic/source/app/comm_bas.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -463,7 +463,7 @@ char *pBuffer = new char[nLength]; pReceiveStream->Read( pBuffer, nLength ); String aReceive( pBuffer, nLength ); - __DELETE(nLength) pBuffer; + delete [] pBuffer; pVar->PutString( aReceive ); delete pReceiveStream; } diff -Naur OOo-build-orig/bridges/source/remote/urp/urp_cache.hxx OOo-build/bridges/source/remote/urp/urp_cache.hxx --- OOo-build-orig/bridges/source/remote/urp/urp_cache.hxx 2001-08-31 11:16:52.000000000 -0500 +++ OOo-build/bridges/source/remote/urp/urp_cache.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -60,6 +60,7 @@ ************************************************************************/ #include #include +#include #ifndef _RTL_USTRING_HXX_ #include diff -Naur OOo-build-orig/codemaker/source/cppumaker/cpputype.cxx OOo-build/codemaker/source/cppumaker/cpputype.cxx --- OOo-build-orig/codemaker/source/cppumaker/cpputype.cxx 2004-01-28 09:27:37.000000000 -0600 +++ OOo-build/codemaker/source/cppumaker/cpputype.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -1531,13 +1531,18 @@ dumpDefaultHIncludes(o); o << "\n"; dumpDepIncludes(o, m_typeName, "hdl"); - o << "\n"; + +// o << "\n"; + o << ("\nnamespace com { namespace sun { namespace star { namespace uno {\n" + "class Type;\n} } } }\n\n"); + dumpNameSpace(o); dumpDeclaration(o); dumpNameSpace(o, sal_False); - o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" - << "class Type;\n} } } }\n\n"; +// o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" +// << "class Type;\n} } } }\n\n"; + o << "\n"; if (m_cppuTypeStatic) o << "static"; @@ -1650,6 +1655,10 @@ dumpAttributes(o); dumpMethods(o); + o << "\n" << indent() + << ("static inline ::com::sun::star::uno::Type const & SAL_CALL" + " static_type(void * = 0);\n"); + dec(); o << "};\n\n"; @@ -1729,6 +1738,16 @@ } } + o << "\n::com::sun::star::uno::Type const & " + << scopedName(rtl::OString(), m_typeName) + << "::static_type(void *) {\n"; + inc(); + o << indent() << "return ::getCppuType(static_cast< "; + dumpType(o, m_typeName); + o << " * >(0));\n"; + dec(); + o << "}\n"; + o << "\n#endif // "<< headerDefine << "\n"; return sal_True; } diff -Naur OOo-build-orig/comphelper/inc/comphelper/broadcasthelper.hxx OOo-build/comphelper/inc/comphelper/broadcasthelper.hxx --- OOo-build-orig/comphelper/inc/comphelper/broadcasthelper.hxx 2002-04-23 06:04:56.000000000 -0500 +++ OOo-build/comphelper/inc/comphelper/broadcasthelper.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -99,7 +99,7 @@ class OBaseMutex { protected: - ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; }; } #endif // _COMPHELPER_BROADCASTHELPER_HXX_ diff -Naur OOo-build-orig/comphelper/inc/comphelper/extract.hxx OOo-build/comphelper/inc/comphelper/extract.hxx --- OOo-build-orig/comphelper/inc/comphelper/extract.hxx 2001-03-07 07:55:53.000000000 -0600 +++ OOo-build/comphelper/inc/comphelper/extract.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -149,7 +149,7 @@ template< typename E > inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum ) { - return ::com::sun::star::uno::Any( &eEnum, ::getCppuType((const E*)0) ); + return ::com::sun::star::uno::Any( &eEnum, getCppuType((const E*)0) ); } /** diff -Naur OOo-build-orig/comphelper/inc/comphelper/guarding.hxx OOo-build/comphelper/inc/comphelper/guarding.hxx --- OOo-build-orig/comphelper/inc/comphelper/guarding.hxx 2000-09-29 06:28:15.000000000 -0500 +++ OOo-build/comphelper/inc/comphelper/guarding.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,18 +115,18 @@ const OReusableGuard& operator= (const OReusableGuard& _rMaster) { - clear(); - pT = _rMaster.pT; - if (pT) - pT->acquire(); + this->clear(); + this->pT = _rMaster.pT; + if (this->pT) + this->pT->acquire(); return *this; } void attach(T& rMutex) { - clear(); - pT = &rMutex; - pT->acquire(); + this->clear(); + this->pT = &rMutex; + this->pT->acquire(); } }; diff -Naur OOo-build-orig/comphelper/inc/comphelper/proparrhlp.hxx OOo-build/comphelper/inc/comphelper/proparrhlp.hxx --- OOo-build-orig/comphelper/inc/comphelper/proparrhlp.hxx 2003-03-19 09:58:31.000000000 -0600 +++ OOo-build/comphelper/inc/comphelper/proparrhlp.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -175,6 +175,6 @@ } //... namespace comphelper ................................................ -#endif _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ diff -Naur OOo-build-orig/comphelper/inc/comphelper/property.hxx OOo-build/comphelper/inc/comphelper/property.hxx --- OOo-build-orig/comphelper/inc/comphelper/property.hxx 2003-03-19 09:58:31.000000000 -0600 +++ OOo-build/comphelper/inc/comphelper/property.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -179,7 +179,7 @@ template sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue) { - if (::getCppuType(&_rCurrentValue).getTypeClass() != staruno::TypeClass_ENUM) + if (getCppuType(&_rCurrentValue).getTypeClass() != staruno::TypeClass_ENUM) return tryPropertyValue(_rConvertedValue, _rOldValue, _rValueToSet, _rCurrentValue); sal_Bool bModified(sal_False); diff -Naur OOo-build-orig/comphelper/inc/comphelper/querydeep.hxx OOo-build/comphelper/inc/comphelper/querydeep.hxx --- OOo-build-orig/comphelper/inc/comphelper/querydeep.hxx 2000-09-29 06:28:15.000000000 -0500 +++ OOo-build/comphelper/inc/comphelper/querydeep.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -101,9 +101,7 @@ const ::com::sun::star::uno::Type& rBaseType, Interface* /*p*/) { - return isDerivedFrom( - rBaseType, - ::getCppuType(static_cast *>(0))); + return isDerivedFrom(rBaseType, Interface::static_type()); } //-------------------------------------------------------------------------------------------------------- @@ -122,7 +120,7 @@ const ::com::sun::star::uno::Type & rType, Interface1 * p1 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); else return ::com::sun::star::uno::Any(); @@ -139,9 +137,9 @@ const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); else return ::com::sun::star::uno::Any(); @@ -159,11 +157,11 @@ const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); else return ::com::sun::star::uno::Any(); @@ -182,13 +180,13 @@ const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); else return ::com::sun::star::uno::Any(); @@ -208,15 +206,15 @@ const ::com::sun::star::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); else return ::com::sun::star::uno::Any(); @@ -239,17 +237,17 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); else return ::com::sun::star::uno::Any(); @@ -273,19 +271,19 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); else return ::com::sun::star::uno::Any(); @@ -310,21 +308,21 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface8::static_type())) return ::com::sun::star::uno::Any( &p8, rType ); else return ::com::sun::star::uno::Any(); @@ -350,23 +348,23 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface8::static_type())) return ::com::sun::star::uno::Any( &p8, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface9::static_type())) return ::com::sun::star::uno::Any( &p9, rType ); else return ::com::sun::star::uno::Any(); @@ -393,25 +391,25 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface8::static_type())) return ::com::sun::star::uno::Any( &p8, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface9::static_type())) return ::com::sun::star::uno::Any( &p9, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface10::static_type())) return ::com::sun::star::uno::Any( &p10, rType ); else return ::com::sun::star::uno::Any(); @@ -441,27 +439,27 @@ Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface8::static_type())) return ::com::sun::star::uno::Any( &p8, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface9::static_type())) return ::com::sun::star::uno::Any( &p9, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface10::static_type())) return ::com::sun::star::uno::Any( &p10, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface11::static_type())) return ::com::sun::star::uno::Any( &p11, rType ); else return ::com::sun::star::uno::Any(); @@ -492,29 +490,29 @@ Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11, Interface12 * p12 ) { - if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + if (isDerivedFrom(rType, Interface1::static_type())) return ::com::sun::star::uno::Any( &p1, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface2::static_type())) return ::com::sun::star::uno::Any( &p2, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface3::static_type())) return ::com::sun::star::uno::Any( &p3, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface4::static_type())) return ::com::sun::star::uno::Any( &p4, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface5::static_type())) return ::com::sun::star::uno::Any( &p5, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface6::static_type())) return ::com::sun::star::uno::Any( &p6, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface7::static_type())) return ::com::sun::star::uno::Any( &p7, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface8::static_type())) return ::com::sun::star::uno::Any( &p8, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface9::static_type())) return ::com::sun::star::uno::Any( &p9, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface10::static_type())) return ::com::sun::star::uno::Any( &p10, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface11::static_type())) return ::com::sun::star::uno::Any( &p11, rType ); - else if (isDerivedFrom(rType, ::getCppuType(static_cast *>(0)))) + else if (isDerivedFrom(rType, Interface12::static_type())) return ::com::sun::star::uno::Any( &p12, rType ); else return ::com::sun::star::uno::Any(); diff -Naur OOo-build-orig/comphelper/inc/comphelper/sequence.hxx OOo-build/comphelper/inc/comphelper/sequence.hxx --- OOo-build-orig/comphelper/inc/comphelper/sequence.hxx 2001-04-20 07:29:47.000000000 -0500 +++ OOo-build/comphelper/inc/comphelper/sequence.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -62,6 +62,8 @@ #ifndef _COMPHELPER_SEQUENCE_HXX_ #define _COMPHELPER_SEQUENCE_HXX_ +#include + #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include #endif diff -Naur OOo-build-orig/comphelper/inc/comphelper/servicehelper.hxx OOo-build/comphelper/inc/comphelper/servicehelper.hxx --- OOo-build-orig/comphelper/inc/comphelper/servicehelper.hxx 2001-03-14 09:52:37.000000000 -0600 +++ OOo-build/comphelper/inc/comphelper/servicehelper.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -135,5 +135,5 @@ } -#endif _UTL_SERVICEHELPER_HXX_ +#endif // _UTL_SERVICEHELPER_HXX_ diff -Naur OOo-build-orig/comphelper/inc/comphelper/types.hxx OOo-build/comphelper/inc/comphelper/types.hxx --- OOo-build-orig/comphelper/inc/comphelper/types.hxx 2000-11-19 09:20:37.000000000 -0600 +++ OOo-build/comphelper/inc/comphelper/types.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -133,7 +133,7 @@ template sal_Bool isA(const staruno::Type& _rType, TYPE* pDummy) { - return _rType.equals(::getCppuType(pDummy)); + return _rType.equals(getCppuType(pDummy)); } //------------------------------------------------------------------------- @@ -143,7 +143,7 @@ template sal_Bool isA(const staruno::Any& _rVal, TYPE* pDummy) { - return _rVal.getValueType().equals(::getCppuType(pDummy)); + return _rVal.getValueType().equals(getCppuType(pDummy)); } //------------------------------------------------------------------------- @@ -152,7 +152,7 @@ template sal_Bool isAReference(const staruno::Type& _rType, TYPE* pDummy) { - return _rType.equals(::getCppuType(reinterpret_cast*>(NULL))); + return _rType.equals(getCppuType(reinterpret_cast*>(NULL))); } //------------------------------------------------------------------------- @@ -161,7 +161,7 @@ template sal_Bool isAReference(const staruno::Any& _rVal, TYPE* pDummy) { - return _rVal.getValueType().equals(::getCppuType(reinterpret_cast*>(NULL))); + return _rVal.getValueType().equals(getCppuType(reinterpret_cast*>(NULL))); } //------------------------------------------------------------------------- @@ -179,10 +179,10 @@ } //------------------------------------------------------------------------- template - sal_Bool getImplementation(TYPE*& _pObject, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace) + sal_Bool getImplementation(TYPE*& _pObject, const staruno::Reference< staruno::XInterface >& _rxIFace) { _pObject = NULL; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel(_rxIFace, UNO_QUERY); + staruno::Reference< starlang::XUnoTunnel > xTunnel(_rxIFace, staruno::UNO_QUERY); if (xTunnel.is()) _pObject = reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelImplementationId())); @@ -199,7 +199,7 @@ /** examine a sequence for the Type of it's elements. */ - ::com::sun::star::uno::Type getSequenceElementType(const ::com::sun::star::uno::Type& _rSequenceType); + staruno::Type getSequenceElementType(const staruno::Type& _rSequenceType); //========================================================================= //= replacement of the former UsrAny.getXXX methods diff -Naur OOo-build-orig/comphelper/inc/comphelper/uno3.hxx OOo-build/comphelper/inc/comphelper/uno3.hxx --- OOo-build-orig/comphelper/inc/comphelper/uno3.hxx 2002-04-23 06:06:59.000000000 -0500 +++ OOo-build/comphelper/inc/comphelper/uno3.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -206,7 +206,8 @@ _rxOut = static_cast(NULL); if (_rxAggregate.is()) { - ::com::sun::star::uno::Any aCheck = _rxAggregate->queryAggregation(::getCppuType((::com::sun::star::uno::Reference*)NULL)); + ::com::sun::star::uno::Any aCheck = _rxAggregate->queryAggregation( + iface::static_type()); if (aCheck.hasValue()) _rxOut = *(::com::sun::star::uno::Reference*)aCheck.getValue(); } @@ -225,7 +226,8 @@ _rxOut = static_cast(NULL); if (_rxObject.is()) { - ::com::sun::star::uno::Any aCheck = _rxObject->queryInterface(::getCppuType((::com::sun::star::uno::Reference*)NULL)); + ::com::sun::star::uno::Any aCheck = _rxObject->queryInterface( + iface::static_type()); if(aCheck.hasValue()) { _rxOut = *(::com::sun::star::uno::Reference*)aCheck.getValue(); diff -Naur OOo-build-orig/configmgr/source/api2/apinodeaccess.hxx OOo-build/configmgr/source/api2/apinodeaccess.hxx --- OOo-build-orig/configmgr/source/api2/apinodeaccess.hxx 2003-03-19 10:18:29.000000000 -0600 +++ OOo-build/configmgr/source/api2/apinodeaccess.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -66,6 +66,10 @@ #include "utility.hxx" #endif +#ifndef CONFIGMGR_ACCESSOR_HXX +#include +#endif + namespace osl { class Mutex; } namespace configmgr diff -Naur OOo-build-orig/configmgr/source/api2/apinodeupdate.hxx OOo-build/configmgr/source/api2/apinodeupdate.hxx --- OOo-build-orig/configmgr/source/api2/apinodeupdate.hxx 2003-03-19 10:18:29.000000000 -0600 +++ OOo-build/configmgr/source/api2/apinodeupdate.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -207,13 +207,13 @@ } template - GuardedNodeUpdate::Updater GuardedNodeUpdate::getNodeUpdater() const + typename GuardedNodeUpdate::Updater GuardedNodeUpdate::getNodeUpdater() const { return get().getNodeUpdater(this->getDataAccessor()); } template - GuardedNodeUpdate::Defaulter GuardedNodeUpdate::getNodeDefaulter() const + typename GuardedNodeUpdate::Defaulter GuardedNodeUpdate::getNodeDefaulter() const { return get().getNodeDefaulter(this->getDataAccessor()); } diff -Naur OOo-build-orig/configmgr/source/api2/listenercontainer.hxx OOo-build/configmgr/source/api2/listenercontainer.hxx --- OOo-build-orig/configmgr/source/api2/listenercontainer.hxx 2003-03-19 10:18:34.000000000 -0600 +++ OOo-build/configmgr/source/api2/listenercontainer.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -155,7 +155,7 @@ BasicContainerInfo() : pInterface(0), pContainer(0) {} }; typedef std::vector BasicContainerHelperArray; - typedef BasicContainerHelperArray::size_type Index; + typedef typename BasicContainerHelperArray::size_type Index; typedef Key_ Key; typedef typename KeyToIndex_::KeyFinder KeyFinder; @@ -380,7 +380,7 @@ bool bAlive = !m_aSpecialHelper.bInDispose; if (m_aSpecialHelper.bDisposed) { - throw lang::DisposedException(OUString(RTL_CONSTASCII_USTRINGPARAM("The object has already been disposed")),pObject); + throw lang::DisposedException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The object has already been disposed")),pObject); } return bAlive; } @@ -647,7 +647,7 @@ KeyList aKeys; if (m_aMapper.findKeysForIndex(_aFinder, nIndex,aKeys)) { - for(KeyList::iterator it = aKeys.begin(); it != aKeys.end(); ++it) + for(typename KeyList::iterator it = aKeys.begin(); it != aKeys.end(); ++it) { if (ListenerContainer* pContainer = m_aSpecialHelper.aLC.getContainer(*it)) { diff -Naur OOo-build-orig/configmgr/source/inc/pointer.hxx OOo-build/configmgr/source/inc/pointer.hxx --- OOo-build-orig/configmgr/source/inc/pointer.hxx 2002-03-28 02:47:03.000000000 -0600 +++ OOo-build/configmgr/source/inc/pointer.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -93,13 +93,13 @@ public: typedef AddressType RawAddress; - Pointer() : m_value(NULL) {} + Pointer() : m_value(0) {} explicit Pointer(AddressType p) : m_value(p) {} RawAddress value() const { return m_value; } - bool isNull() const { return m_value == NULL; } - bool is() const { return m_value != NULL; } + bool isNull() const { return m_value == 0; } + bool is() const { return m_value != 0; } operator Opaque_ const * () const { return reinterpret_cast(m_value); } diff -Naur OOo-build-orig/configmgr/source/inc/treeaccessor.hxx OOo-build/configmgr/source/inc/treeaccessor.hxx --- OOo-build-orig/configmgr/source/inc/treeaccessor.hxx 2003-04-01 07:34:24.000000000 -0600 +++ OOo-build/configmgr/source/inc/treeaccessor.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -160,7 +160,7 @@ { sharable::Address aAddr = p.addressValue(); - if (aAddr) aAddr += offsetof(DataType,nodes); + if (aAddr) aAddr += offsetof(TreeAddress::DataType,nodes); return NodeAddress( memory::Pointer(aAddr) ); } diff -Naur OOo-build-orig/connectivity/source/drivers/jdbc/Connection.cxx OOo-build/connectivity/source/drivers/jdbc/Connection.cxx --- OOo-build-orig/connectivity/source/drivers/jdbc/Connection.cxx 2003-06-06 05:50:29.000000000 -0500 +++ OOo-build/connectivity/source/drivers/jdbc/Connection.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -674,7 +674,13 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out ? makeAny(java_sql_SQLWarning(java_sql_SQLWarning_BASE( t.pEnv, out ),*this)) : Any(); + if( out ) + { + java_sql_SQLWarning_BASE warn_base(t.pEnv, out); + return makeAny(java_sql_SQLWarning(warn_base,*this)); + } + + return Any(); } // ----------------------------------------------------------------------------- void java_sql_Connection::loadDriverFromProperties(const Sequence< PropertyValue >& info, diff -Naur OOo-build-orig/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx OOo-build/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx --- OOo-build-orig/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 2003-04-24 08:20:00.000000000 -0500 +++ OOo-build/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -1627,7 +1627,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1856,7 +1856,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1875,7 +1875,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1894,7 +1894,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1913,7 +1913,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1932,7 +1932,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_True); SDBThreadAttach t; if( t.pEnv ){ @@ -1951,7 +1951,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1970,7 +1970,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -1989,7 +1989,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2008,7 +2008,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2027,7 +2027,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2046,7 +2046,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2065,7 +2065,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ jvalue args[2]; @@ -2088,7 +2088,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2107,7 +2107,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2126,7 +2126,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2145,7 +2145,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2164,7 +2164,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2183,7 +2183,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2202,7 +2202,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2221,7 +2221,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2240,7 +2240,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2259,7 +2259,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2278,7 +2278,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2297,7 +2297,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2316,7 +2316,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2335,7 +2335,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2354,7 +2354,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2373,7 +2373,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2392,7 +2392,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2411,7 +2411,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2430,7 +2430,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2449,7 +2449,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2468,7 +2468,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2487,7 +2487,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2506,7 +2506,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2525,7 +2525,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2544,7 +2544,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2563,7 +2563,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2766,7 +2766,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -2785,7 +2785,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -2804,7 +2804,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -2961,7 +2961,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2980,7 +2980,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -2999,7 +2999,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -3018,7 +3018,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -3037,7 +3037,7 @@ // ------------------------------------------------------------------------- sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) { - jboolean out; + jboolean out(sal_False); SDBThreadAttach t; if( t.pEnv ){ @@ -3056,7 +3056,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -3075,7 +3075,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -3094,7 +3094,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ @@ -3113,7 +3113,7 @@ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) { - jint out; + jint out(0); SDBThreadAttach t; if( t.pEnv ){ diff -Naur OOo-build-orig/connectivity/source/drivers/jdbc/ResultSet.cxx OOo-build/connectivity/source/drivers/jdbc/ResultSet.cxx --- OOo-build-orig/connectivity/source/drivers/jdbc/ResultSet.cxx 2003-04-24 08:21:49.000000000 -0500 +++ OOo-build/connectivity/source/drivers/jdbc/ResultSet.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -290,7 +290,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - jbyte out; + jbyte out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gelöscht worden!"); if( t.pEnv ) { @@ -360,7 +360,7 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - jdouble out; + jdouble out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gelöscht worden!"); if( t.pEnv ) { @@ -381,7 +381,7 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - jfloat out; + jfloat out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gelöscht worden!"); if( t.pEnv ) { @@ -443,7 +443,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - jlong out; + jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gelöscht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren @@ -593,7 +593,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - jshort out; + jshort out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment gelöscht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren @@ -1070,7 +1070,13 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out ? makeAny(java_sql_SQLWarning(java_sql_SQLWarning_BASE( t.pEnv, out ),*this)) : ::com::sun::star::uno::Any(); + if( out ) + { + java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); + return makeAny(java_sql_SQLWarning(warn_base,*this)); + } + + return ::com::sun::star::uno::Any(); } // ------------------------------------------------------------------------- diff -Naur OOo-build-orig/connectivity/source/drivers/jdbc/SQLException.cxx OOo-build/connectivity/source/drivers/jdbc/SQLException.cxx --- OOo-build-orig/connectivity/source/drivers/jdbc/SQLException.cxx 2003-04-24 08:22:09.000000000 -0500 +++ OOo-build/connectivity/source/drivers/jdbc/SQLException.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -140,7 +140,13 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out ? (starsdbc::SQLException)java_sql_SQLException(java_sql_SQLException_BASE(t.pEnv,out),0) : starsdbc::SQLException(); + if( out ) + { + java_sql_SQLException_BASE warn_base(t.pEnv,out); + return (starsdbc::SQLException)java_sql_SQLException(warn_base,0); + } + + return starsdbc::SQLException(); } ::rtl::OUString java_sql_SQLException_BASE::getSQLState() const diff -Naur OOo-build-orig/connectivity/source/drivers/jdbc/Statement.cxx OOo-build/connectivity/source/drivers/jdbc/Statement.cxx --- OOo-build-orig/connectivity/source/drivers/jdbc/Statement.cxx 2003-04-24 08:22:28.000000000 -0500 +++ OOo-build/connectivity/source/drivers/jdbc/Statement.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -550,7 +550,13 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out ? makeAny(java_sql_SQLWarning(java_sql_SQLWarning_BASE( t.pEnv, out ),*(::cppu::OWeakObject*)this)) : Any(); + if( out ) + { + java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); + return makeAny(java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this)); + } + + return Any(); } // ------------------------------------------------------------------------- void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) diff -Naur OOo-build-orig/connectivity/source/drivers/mozab/makefile.mk OOo-build/connectivity/source/drivers/mozab/makefile.mk --- OOo-build-orig/connectivity/source/drivers/mozab/makefile.mk 2004-01-09 09:00:54.000000000 -0600 +++ OOo-build/connectivity/source/drivers/mozab/makefile.mk 2005-04-26 23:59:58.000000000 -0500 @@ -66,7 +66,7 @@ TARGET=$(MOZAB_TARGET) TARGET2=$(MOZAB_TARGET)drv -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "YES" all: @echo " Not building the mozabsrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" diff -Naur OOo-build-orig/connectivity/source/drivers/mozab/mozillasrc/makefile.mk OOo-build/connectivity/source/drivers/mozab/mozillasrc/makefile.mk --- OOo-build-orig/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 2004-01-09 09:00:55.000000000 -0600 +++ OOo-build/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 2005-04-26 23:59:58.000000000 -0500 @@ -85,7 +85,7 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "YES" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" diff -Naur OOo-build-orig/connectivity/source/parse/sqlNoException.cxx OOo-build/connectivity/source/parse/sqlNoException.cxx --- OOo-build-orig/connectivity/source/parse/sqlNoException.cxx 2004-01-09 09:00:58.000000000 -0600 +++ OOo-build/connectivity/source/parse/sqlNoException.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -119,8 +119,6 @@ } // ----------------------------------------------------------------------------- } -// ----------------------------------------------------------------------------- -DBG_NAME(OSQLParseNode); //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue, SQLNodeType eNewNodeType, diff -Naur OOo-build-orig/cppu/inc/com/sun/star/uno/Any.hxx OOo-build/cppu/inc/com/sun/star/uno/Any.hxx --- OOo-build-orig/cppu/inc/com/sun/star/uno/Any.hxx 2002-08-19 02:18:44.000000000 -0500 +++ OOo-build/cppu/inc/com/sun/star/uno/Any.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -191,14 +191,14 @@ template< class C > inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) { - return Any( &value, ::getCppuType( &value ) ); + return Any( &value, getCppuType( &value ) ); } //__________________________________________________________________________________________________ template< class C > inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( &value ); + const Type & rType = getCppuType( &value ); ::uno_type_any_assign( &rAny, const_cast< C * >( &value ), rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); @@ -207,7 +207,7 @@ template< class C > inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( &value ); + const Type & rType = getCppuType( &value ); return ::uno_type_assignData( &value, rType.getTypeLibType(), rAny.pData, rAny.pType, @@ -510,7 +510,7 @@ template< class C > inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( &value ); + const Type & rType = getCppuType( &value ); return ::uno_type_equalData( rAny.pData, rAny.pType, const_cast< C * >( &value ), rType.getTypeLibType(), diff -Naur OOo-build-orig/cppu/inc/com/sun/star/uno/Reference.hxx OOo-build/cppu/inc/com/sun/star/uno/Reference.hxx --- OOo-build-orig/cppu/inc/com/sun/star/uno/Reference.hxx 2002-08-21 04:19:06.000000000 -0500 +++ OOo-build/cppu/inc/com/sun/star/uno/Reference.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -104,7 +104,7 @@ { return static_cast< interface_type * >( BaseReference::iquery( - pInterface, ::getCppuType( (const Reference< interface_type > *)0 ) ) ); + pInterface, getCppuType( (const Reference< interface_type > *)0 ) ) ); } #ifndef EXCEPTIONS_OFF extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( @@ -129,7 +129,7 @@ { return static_cast< interface_type * >( BaseReference::iquery_throw( - pInterface, ::getCppuType( (const Reference< interface_type > *)0 ) ) ); + pInterface, getCppuType( (const Reference< interface_type > *)0 ) ) ); } #endif diff -Naur OOo-build-orig/cppu/inc/com/sun/star/uno/Sequence.hxx OOo-build/cppu/inc/com/sun/star/uno/Sequence.hxx --- OOo-build-orig/cppu/inc/com/sun/star/uno/Sequence.hxx 2004-01-28 04:19:00.000000000 -0600 +++ OOo-build/cppu/inc/com/sun/star/uno/Sequence.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -97,7 +97,7 @@ template< class E > inline Sequence< E >::Sequence() SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), 0, 0, (uno_AcquireFunc)cpp_acquire ); @@ -119,7 +119,7 @@ template< class E > inline Sequence< E >::Sequence( const E * pElements, sal_Int32 len ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), const_cast< E * >( pElements ), len, (uno_AcquireFunc)cpp_acquire ); @@ -128,7 +128,7 @@ template< class E > inline Sequence< E >::Sequence( sal_Int32 len ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), 0, len, (uno_AcquireFunc)cpp_acquire ); @@ -137,7 +137,7 @@ template< class E > inline Sequence< E >::~Sequence() SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_destructData( this, rType.getTypeLibType(), (uno_ReleaseFunc)cpp_release ); } @@ -145,7 +145,7 @@ template< class E > inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_assign( &_pSequence, rSeq._pSequence, rType.getTypeLibType(), (uno_ReleaseFunc)cpp_release ); return *this; @@ -156,7 +156,7 @@ { if (_pSequence == rSeq._pSequence) return sal_True; - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); return ::uno_type_equalData( const_cast< Sequence< E > * >( this ), rType.getTypeLibType(), const_cast< Sequence< E > * >( &rSeq ), rType.getTypeLibType(), @@ -172,7 +172,7 @@ template< class E > inline E * Sequence< E >::getArray() SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_reference2One( &_pSequence, rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); @@ -183,7 +183,7 @@ inline E & Sequence< E >::operator [] ( sal_Int32 nIndex ) SAL_THROW( () ) { OSL_ENSURE( nIndex >= 0 && nIndex < getLength(), "### illegal index of sequence!" ); - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_reference2One( &_pSequence, rType.getTypeLibType(), (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); @@ -200,7 +200,7 @@ template< class E > inline void Sequence< E >::realloc( sal_Int32 nSize ) SAL_THROW( () ) { - const Type & rType = ::getCppuType( this ); + const Type & rType = getCppuType( this ); ::uno_type_sequence_realloc( &_pSequence, rType.getTypeLibType(), nSize, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); @@ -226,7 +226,7 @@ { if (! ::com::sun::star::uno::Sequence< E >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( + const ::com::sun::star::uno::Type & rElementType = getCppuType( (typename ::com::sun::star::uno::Sequence< E >::ElementType const *)0 ); ::typelib_static_sequence_type_init( & ::com::sun::star::uno::Sequence< E >::s_pType, diff -Naur OOo-build-orig/cppu/inc/com/sun/star/uno/Type.hxx OOo-build/cppu/inc/com/sun/star/uno/Type.hxx --- OOo-build-orig/cppu/inc/com/sun/star/uno/Type.hxx 2002-08-21 04:19:08.000000000 -0500 +++ OOo-build/cppu/inc/com/sun/star/uno/Type.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -250,7 +250,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( *pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( *pT ); sal_Int32 size = sizeof( **pT ); sal_Int32 dim1 = sizeof( *pT ) / size; ::typelib_static_array_type_init( @@ -266,7 +266,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( **pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( **pT ); sal_Int32 size = sizeof( ***pT ); sal_Int32 dim2 = sizeof( **pT ) / size; sal_Int32 dim1 = sizeof( *pT ) / dim2 / size; @@ -283,7 +283,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( ***pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( ***pT ); sal_Int32 size = sizeof( ****pT ); sal_Int32 dim3 = sizeof( ***pT ) / size; sal_Int32 dim2 = sizeof( **pT ) / dim3 / size; @@ -301,7 +301,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( ****pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( ****pT ); sal_Int32 size = sizeof( *****pT ); sal_Int32 dim4 = sizeof( ****pT ) / size; sal_Int32 dim3 = sizeof( ***pT ) / dim4 / size; @@ -320,7 +320,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( *****pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( *****pT ); sal_Int32 size = sizeof( ******pT ); sal_Int32 dim5 = sizeof( *****pT ) / size; sal_Int32 dim4 = sizeof( ****pT ) / dim5 / size; @@ -340,7 +340,7 @@ { if (! ::com::sun::star::uno::Array< T >::s_pType) { - const ::com::sun::star::uno::Type & rElementType = ::getCppuType( ******pT ); + const ::com::sun::star::uno::Type & rElementType = getCppuType( ******pT ); sal_Int32 size = sizeof( *******pT ); sal_Int32 dim6 = sizeof( ******pT ) / size; sal_Int32 dim5 = sizeof( *****pT ) / dim6 / size; diff -Naur OOo-build-orig/cppu/inc/uno/lbnames.h OOo-build/cppu/inc/uno/lbnames.h --- OOo-build-orig/cppu/inc/uno/lbnames.h 2003-04-28 11:26:36.000000000 -0500 +++ OOo-build/cppu/inc/uno/lbnames.h 2005-04-26 23:59:58.000000000 -0500 @@ -94,7 +94,7 @@ #define TMP_CPPU_ENV gcc2 #elif (__GNUC__ == 2) #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." -#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) +#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4) #define __CPPU_ENV gcc3 #elif (__GNUC__ == 3) #error "Tested gcc 3 version is <= 3.3. Patch uno/lbnames.h to try your gcc 3 version." diff -Naur OOo-build-orig/cppu/inc/uno/mapping.hxx OOo-build/cppu/inc/uno/mapping.hxx --- OOo-build-orig/cppu/inc/uno/mapping.hxx 2001-11-09 03:14:30.000000000 -0600 +++ OOo-build/cppu/inc/uno/mapping.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -340,7 +340,7 @@ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); OSL_ASSERT( aMapping.is() ); - aMapping.mapInterface( (void **)ppRet, pUnoI, ::getCppuType( ppRet ) ); + aMapping.mapInterface( (void **)ppRet, pUnoI, getCppuType( ppRet ) ); return (0 != *ppRet); } /** Maps an UNO interface of the currently used compiler environment to binary C UNO. @@ -357,7 +357,7 @@ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) ); OSL_ASSERT( aMapping.is() ); - aMapping.mapInterface( (void **)ppRet, x.get(), ::getCppuType( &x ) ); + aMapping.mapInterface( (void **)ppRet, x.get(), getCppuType( &x ) ); return (0 != *ppRet); } diff -Naur OOo-build-orig/cppu/test/surrogate.hxx OOo-build/cppu/test/surrogate.hxx --- OOo-build-orig/cppu/test/surrogate.hxx 2001-03-12 07:28:13.000000000 -0600 +++ OOo-build/cppu/test/surrogate.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -125,7 +125,7 @@ rOut.clear(); typelib_TypeDescription * pTD = 0; - const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal ); + const com::sun::star::uno::Type & rType = getCppuType( &rOriginal ); TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); OSL_ENSURE( pTD, "### cannot get typedescription!" ); if (pTD) @@ -157,7 +157,7 @@ if (aCpp2Uno.is() && aUno2Cpp.is()) { typelib_TypeDescription * pTD = 0; - const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal ); + const com::sun::star::uno::Type & rType = getCppuType( &rOriginal ); TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); OSL_ENSURE( pTD, "### cannot get typedescription!" ); if (pTD) diff -Naur OOo-build-orig/cppu/test/test_di.cxx OOo-build/cppu/test/test_di.cxx --- OOo-build-orig/cppu/test/test_di.cxx 2002-08-19 02:18:48.000000000 -0500 +++ OOo-build/cppu/test/test_di.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -648,7 +648,7 @@ { try { - Any aRet( xObj->queryInterface( ::getCppuType( (const lang::IllegalArgumentException *)0 ) ) ); + Any aRet( xObj->queryInterface( getCppuType( (const lang::IllegalArgumentException *)0 ) ) ); OSL_ASSERT( ! aRet.hasValue() ); } catch (RuntimeException &) @@ -719,24 +719,24 @@ // C++ -> UNO Mapping mapping( pCppEnv, pUnoEnv ); - mapping.mapInterface( (void **)&pUnoI, xOriginal.get(), ::getCppuType( &xOriginal ) ); + mapping.mapInterface( (void **)&pUnoI, xOriginal.get(), getCppuType( &xOriginal ) ); #ifdef EXTRA_MAPPING // UNO -> ano C++a ::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 ); mapping = Mapping( pUnoEnv, pCppEnv ); - mapping.mapInterface( (void **)&xMapped, pUnoI, ::getCppuType( &xMapped ) ); + mapping.mapInterface( (void **)&xMapped, pUnoI, getCppuType( &xMapped ) ); // ano C++a -> ano UNOa ::uno_createEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 ); mapping = Mapping( pCppEnv, pUnoEnv ); - mapping.mapInterface( (void **)&pUnoI, xMapped.get(), ::getCppuType( &xMapped ) ); + mapping.mapInterface( (void **)&pUnoI, xMapped.get(), getCppuType( &xMapped ) ); pExtraMapping = " <-> c++ <-> uno"; #endif // ano UNOa -> ano C++b ::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 ); mapping = Mapping( pUnoEnv, pCppEnv ); - mapping.mapInterface( (void **)&xMapped, pUnoI, ::getCppuType( &xMapped ) ); + mapping.mapInterface( (void **)&xMapped, pUnoI, getCppuType( &xMapped ) ); (*pUnoI->release)( pUnoI ); (*pCppEnv->release)( pCppEnv ); (*pUnoEnv->release)( pUnoEnv ); @@ -786,14 +786,14 @@ ::uno_getEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 ); ::uno_getEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 ); Mapping aCpp2Uno( pCppEnv, pUnoEnv ); - aCpp2Uno.mapInterface( (void **)&pUnoI1, xOriginal.get(), ::getCppuType( &xOriginal ) ); + aCpp2Uno.mapInterface( (void **)&pUnoI1, xOriginal.get(), getCppuType( &xOriginal ) ); (*pCppEnv->release)( pCppEnv ); // UNO -> C uno_Environment * pCEnv = 0; ::uno_getEnvironment( &pCEnv, aCEnvTypeName.pData, 0 ); Mapping aUno2C( pUnoEnv, pCEnv ); - aUno2C.mapInterface( &pC, pUnoI1, ::getCppuType( &xOriginal ) ); + aUno2C.mapInterface( &pC, pUnoI1, getCppuType( &xOriginal ) ); (*pUnoI1->release)( pUnoI1 ); (*pUnoEnv->release)( pUnoEnv ); @@ -801,7 +801,7 @@ uno_Environment * pAnoUnoEnv = 0; ::uno_createEnvironment( &pAnoUnoEnv, aUnoEnvTypeName.pData, 0 ); // anonymous Mapping aC2Uno( pCEnv, pAnoUnoEnv ); - aC2Uno.mapInterface( (void **)&pUnoI2, pC, ::getCppuType( &xOriginal ) ); + aC2Uno.mapInterface( (void **)&pUnoI2, pC, getCppuType( &xOriginal ) ); (*pCEnv->pExtEnv->releaseInterface)( pCEnv->pExtEnv, pC ); (*pCEnv->release)( pCEnv ); @@ -811,7 +811,7 @@ Mapping aUno2Cpp( pAnoUnoEnv, pAnoCppEnv ); (*pAnoCppEnv->release)( pAnoCppEnv ); (*pAnoUnoEnv->release)( pAnoUnoEnv ); - aUno2Cpp.mapInterface( (void **)&xMapped, pUnoI2, ::getCppuType( &xOriginal ) ); + aUno2Cpp.mapInterface( (void **)&xMapped, pUnoI2, getCppuType( &xOriginal ) ); (*pUnoI2->release)( pUnoI2 ); } @@ -849,7 +849,7 @@ OSL_ENSURE( pXIface != 0, "create test object failed\n"); /* Get interface XFoo2 */ - if (CUNO_EXCEPTION_OCCURED( CUNO_CALL(pXIface)->queryInterface( pXIface, &aExc, (com_sun_star_uno_XInterface**)&pXLBTest, ::getCppuType( &xMapped ).getTypeLibType()) )) + if (CUNO_EXCEPTION_OCCURED( CUNO_CALL(pXIface)->queryInterface( pXIface, &aExc, (com_sun_star_uno_XInterface**)&pXLBTest, getCppuType( &xMapped ).getTypeLibType()) )) { uno_any_destruct( &aExc, 0 ); } @@ -858,7 +858,7 @@ Mapping aC2Cpp( OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_C) ), OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); - aC2Cpp.mapInterface( (void **)&xMapped, pXLBTest, ::getCppuType( &xMapped ) ); + aC2Cpp.mapInterface( (void **)&xMapped, pXLBTest, getCppuType( &xMapped ) ); OSL_ENSURE( xMapped.is(), "mapping interface failed\n"); diff -Naur OOo-build-orig/cppu/test/testcppu.cxx OOo-build/cppu/test/testcppu.cxx --- OOo-build-orig/cppu/test/testcppu.cxx 2002-08-19 02:18:49.000000000 -0500 +++ OOo-build/cppu/test/testcppu.cxx 2005-04-26 23:59:58.000000000 -0500 @@ -324,8 +324,8 @@ a3.td.dDouble = 2; a3.bBool = sal_True; a3.aAny = makeAny( (sal_Int32)2 ); - OSL_ASSERT( a3.aAny.isExtractableTo( ::getCppuType( (sal_Int64 const *)0 ) ) ); - OSL_ASSERT( ::getCppuType( (sal_Int64 const *)0 ).isAssignableFrom( a3.aAny.getValueType() ) ); + OSL_ASSERT( a3.aAny.isExtractableTo( getCppuType( (sal_Int64 const *)0 ) ) ); + OSL_ASSERT( getCppuType( (sal_Int64 const *)0 ).isAssignableFrom( a3.aAny.getValueType() ) ); bAssignable = uno_type_assignData( &sz3, getCppuType( (Test3*)0).getTypeLibType(), &a3, getCppuType( (Test3*)0).getTypeLibType(), @@ -579,7 +579,7 @@ static void test_assignSimple( const T & rVal, /*const*/ Any /*&*/ rAny ) { typelib_TypeDescription * pTD = 0; - ::getCppuType( &rVal ).getDescription( &pTD ); + getCppuType( &rVal ).getDescription( &pTD ); sal_Bool bTable = s_aAssignableFromTab[pTD->eTypeClass-1][rAny.getValueTypeClass()-1]; OSL_ASSERT( (bTable!=sal_False) == diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase1.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase1.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase1.hxx 2004-01-28 09:29:53.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase1.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,8 +115,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper1< Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper1< Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper1< Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper1< Ifc1 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper1< Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper1< Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper1< Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper1< Ifc1 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase10.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase10.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase10.hxx 2004-01-28 09:30:23.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase10.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,8 +115,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase11.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase11.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase11.hxx 2004-01-28 09:30:54.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase11.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,8 +115,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase12.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase12.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase12.hxx 2004-01-28 09:31:29.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase12.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,8 +115,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase2.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase2.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase2.hxx 2004-01-28 09:32:04.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase2.hxx 2005-04-26 23:59:58.000000000 -0500 @@ -115,9 +115,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -164,9 +164,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase3.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase3.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase3.hxx 2004-01-28 09:32:42.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase3.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,10 +115,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -165,10 +165,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase4.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase4.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase4.hxx 2004-01-28 09:33:03.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase4.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,11 +115,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -166,11 +166,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase5.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase5.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase5.hxx 2004-01-28 09:33:35.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase5.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,12 +115,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -167,12 +167,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase6.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase6.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase6.hxx 2004-01-28 09:34:19.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase6.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,13 +115,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -168,13 +168,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase7.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase7.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase7.hxx 2004-01-28 09:34:56.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase7.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,8 +115,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase8.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase8.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase8.hxx 2004-01-28 09:35:27.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase8.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,8 +115,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/compbase9.hxx OOo-build/cppuhelper/inc/cppuhelper/compbase9.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/compbase9.hxx 2004-01-28 09:35:53.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/compbase9.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,8 +115,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and @@ -163,8 +163,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggComponentImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase.hxx 2004-01-28 09:36:21.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -259,11 +259,11 @@ static ClassData##N 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, (ImplHelperBase##N< __IFC##N > *)this ); } \ + { return this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)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(); } \ + { return this->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(); } \ + { return this->getClassData( s_aCD ).getImplementationId(); } \ }; \ template< __CLASS_IFC##N > \ class SAL_NO_VTABLE WeakImplHelper##N \ @@ -274,7 +274,7 @@ 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, (ImplHelperBase##N< __IFC##N > *)this ) ); \ + ::com::sun::star::uno::Any aRet( this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \ return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); \ } \ virtual void SAL_CALL acquire() throw () \ @@ -282,9 +282,9 @@ 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(); } \ + { return this->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(); } \ + { return this->getClassData( s_aCD ).getImplementationId(); } \ }; \ template< __CLASS_IFC##N > \ class SAL_NO_VTABLE WeakAggImplHelper##N \ @@ -297,7 +297,7 @@ { 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, (ImplHelperBase##N< __IFC##N > *)this ) ); \ + ::com::sun::star::uno::Any aRet( this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \ return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); \ } \ virtual void SAL_CALL acquire() throw () \ @@ -305,9 +305,9 @@ 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(); } \ + { return this->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(); } \ + { return this->getClassData( s_aCD ).getImplementationId(); } \ }; /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase1.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase1.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase1.hxx 2004-01-28 09:36:53.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase1.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -112,8 +112,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper1< Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper1< Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper1< Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper1< Ifc1 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -150,8 +150,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper1< Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper1< Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper1< Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper1< Ifc1 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -195,8 +195,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper1< Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper1< Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper1< Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper1< Ifc1 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -244,8 +244,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -295,8 +295,8 @@ 1 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper1< BaseClass, Ifc1 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase10.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase10.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase10.hxx 2004-01-28 09:37:26.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase10.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -116,8 +116,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -154,8 +154,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -199,8 +199,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -248,8 +248,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -299,8 +299,8 @@ 10 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper10< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase11.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase11.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase11.hxx 2004-01-28 09:37:59.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase11.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -117,8 +117,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -155,8 +155,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -200,8 +200,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -249,8 +249,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -300,8 +300,8 @@ 11 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper11< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase12.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase12.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase12.hxx 2004-01-28 09:38:27.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase12.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -117,8 +117,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -155,8 +155,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -200,8 +200,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -249,8 +249,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -300,8 +300,8 @@ 12 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc10 > const * ))&getCppuType, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc11 > const * ))&getCppuType, ((sal_Int32)(Ifc11 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc12 > const * ))&getCppuType, ((sal_Int32)(Ifc12 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc10::static_type, ((sal_Int32)(Ifc10 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc11::static_type, ((sal_Int32)(Ifc11 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, { Ifc12::static_type, ((sal_Int32)(Ifc12 *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper12< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase2.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase2.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase2.hxx 2004-01-28 09:39:01.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase2.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -112,9 +112,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -151,9 +151,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -197,9 +197,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper2< Ifc1, Ifc2 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -247,9 +247,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -299,9 +299,9 @@ 2 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper2< BaseClass, Ifc1, Ifc2 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase3.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase3.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase3.hxx 2004-01-28 09:39:45.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase3.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -113,10 +113,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -153,10 +153,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -200,10 +200,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper3< Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -251,10 +251,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -304,10 +304,10 @@ 3 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper3< BaseClass, Ifc1, Ifc2, Ifc3 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase4.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase4.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase4.hxx 2004-01-28 09:40:19.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase4.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -113,11 +113,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -154,11 +154,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -202,11 +202,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper4< Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -254,11 +254,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -308,11 +308,11 @@ 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper4< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase5.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase5.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase5.hxx 2004-01-28 09:40:53.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase5.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -114,12 +114,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -156,12 +156,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -205,12 +205,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper5< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -258,12 +258,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -313,12 +313,12 @@ 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper5< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase6.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase6.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase6.hxx 2004-01-28 09:41:20.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase6.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -114,13 +114,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -157,13 +157,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -207,13 +207,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper6< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -261,13 +261,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -317,13 +317,13 @@ 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper6< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase7.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase7.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase7.hxx 2004-01-28 09:41:53.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase7.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,8 +115,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -153,8 +153,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -198,8 +198,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -247,8 +247,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -298,8 +298,8 @@ 7 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper7< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase8.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase8.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase8.hxx 2004-01-28 09:42:34.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase8.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -115,8 +115,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -153,8 +153,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -198,8 +198,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -247,8 +247,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -298,8 +298,8 @@ 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper8< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/implbase9.hxx OOo-build/cppuhelper/inc/cppuhelper/implbase9.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/implbase9.hxx 2004-01-28 09:43:15.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/implbase9.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -116,8 +116,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -154,8 +154,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -199,8 +199,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (WeakAggImplHelper9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -248,8 +248,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (ImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and @@ -299,8 +299,8 @@ 9 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc9 > const * ))&getCppuType, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, { Ifc9::static_type, ((sal_Int32)(Ifc9 *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (AggImplInheritanceHelper9< BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9 > *) 16) - 16 } } }; } diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/queryinterface.hxx OOo-build/cppuhelper/inc/cppuhelper/queryinterface.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/queryinterface.hxx 2001-11-09 07:49:15.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/queryinterface.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -62,11 +62,18 @@ #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #define _CPPUHELPER_QUERYINTERFACE_HXX_ -#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_ -#include +#ifndef _SAL_CONFIG_H_ +#include "sal/config.h" #endif -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ -#include + +#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ +#include "com/sun/star/uno/Any.hxx" +#endif +#ifndef _COM_SUN_STAR_UNO_TYPE_HXX_ +#include "com/sun/star/uno/Type.hxx" +#endif +#ifndef _SAL_TYPES_H_ +#include "sal/types.h" #endif namespace cppu @@ -85,7 +92,7 @@ Interface1 * p1 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); else return ::com::sun::star::uno::Any(); @@ -105,9 +112,9 @@ Interface1 * p1, Interface2 * p2 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); else return ::com::sun::star::uno::Any(); @@ -129,11 +136,11 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); else return ::com::sun::star::uno::Any(); @@ -157,13 +164,13 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); else return ::com::sun::star::uno::Any(); @@ -189,15 +196,15 @@ Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); else return ::com::sun::star::uno::Any(); @@ -227,17 +234,17 @@ Interface6 * p6 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); else return ::com::sun::star::uno::Any(); @@ -269,19 +276,19 @@ Interface6 * p6, Interface7 * p7 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); else return ::com::sun::star::uno::Any(); @@ -315,21 +322,21 @@ Interface6 * p6, Interface7 * p7, Interface8 * p8 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *)0 )) + else if (rType == Interface8::static_type()) return ::com::sun::star::uno::Any( &p8, rType ); else return ::com::sun::star::uno::Any(); @@ -365,23 +372,23 @@ Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *)0 )) + else if (rType == Interface8::static_type()) return ::com::sun::star::uno::Any( &p8, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *)0 )) + else if (rType == Interface9::static_type()) return ::com::sun::star::uno::Any( &p9, rType ); else return ::com::sun::star::uno::Any(); @@ -419,25 +426,25 @@ Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *)0 )) + else if (rType == Interface8::static_type()) return ::com::sun::star::uno::Any( &p8, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *)0 )) + else if (rType == Interface9::static_type()) return ::com::sun::star::uno::Any( &p9, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface10 > *)0 )) + else if (rType == Interface10::static_type()) return ::com::sun::star::uno::Any( &p10, rType ); else return ::com::sun::star::uno::Any(); @@ -479,27 +486,27 @@ Interface11 * p11 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *)0 )) + else if (rType == Interface8::static_type()) return ::com::sun::star::uno::Any( &p8, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *)0 )) + else if (rType == Interface9::static_type()) return ::com::sun::star::uno::Any( &p9, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface10 > *)0 )) + else if (rType == Interface10::static_type()) return ::com::sun::star::uno::Any( &p10, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface11 > *)0 )) + else if (rType == Interface11::static_type()) return ::com::sun::star::uno::Any( &p11, rType ); else return ::com::sun::star::uno::Any(); @@ -543,29 +550,29 @@ Interface11 * p11, Interface12 * p12 ) SAL_THROW( () ) { - if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *)0 )) + if (rType == Interface1::static_type()) return ::com::sun::star::uno::Any( &p1, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *)0 )) + else if (rType == Interface2::static_type()) return ::com::sun::star::uno::Any( &p2, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *)0 )) + else if (rType == Interface3::static_type()) return ::com::sun::star::uno::Any( &p3, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *)0 )) + else if (rType == Interface4::static_type()) return ::com::sun::star::uno::Any( &p4, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *)0 )) + else if (rType == Interface5::static_type()) return ::com::sun::star::uno::Any( &p5, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *)0 )) + else if (rType == Interface6::static_type()) return ::com::sun::star::uno::Any( &p6, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *)0 )) + else if (rType == Interface7::static_type()) return ::com::sun::star::uno::Any( &p7, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *)0 )) + else if (rType == Interface8::static_type()) return ::com::sun::star::uno::Any( &p8, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *)0 )) + else if (rType == Interface9::static_type()) return ::com::sun::star::uno::Any( &p9, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface10 > *)0 )) + else if (rType == Interface10::static_type()) return ::com::sun::star::uno::Any( &p10, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface11 > *)0 )) + else if (rType == Interface11::static_type()) return ::com::sun::star::uno::Any( &p11, rType ); - else if (rType == ::getCppuType( (::com::sun::star::uno::Reference< Interface12 > *)0 )) + else if (rType == Interface12::static_type()) return ::com::sun::star::uno::Any( &p12, rType ); else return ::com::sun::star::uno::Any(); diff -Naur OOo-build-orig/cppuhelper/inc/cppuhelper/stdidlclass.hxx OOo-build/cppuhelper/inc/cppuhelper/stdidlclass.hxx --- OOo-build-orig/cppuhelper/inc/cppuhelper/stdidlclass.hxx 2001-10-29 09:27:57.000000000 -0600 +++ OOo-build/cppuhelper/inc/cppuhelper/stdidlclass.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -102,9 +102,7 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(1); - seqInterface.getArray()[0] = - ::getCppuType( ( ::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -127,12 +125,8 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(2); - seqInterface.getArray()[0] = - ::getCppuType( ( ::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( ( ::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -158,15 +152,9 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(3); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -193,18 +181,10 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(4); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -234,21 +214,11 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(5); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -277,24 +247,12 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(6); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - - seqInterface.getArray()[5] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); + seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -325,27 +283,13 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(7); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - - seqInterface.getArray()[5] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *) 0 ).getTypeName(); - - seqInterface.getArray()[6] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); + seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); + seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -378,30 +322,14 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(8); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - - seqInterface.getArray()[5] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *) 0 ).getTypeName(); - - seqInterface.getArray()[6] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *) 0 ).getTypeName(); - - seqInterface.getArray()[7] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); + seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); + seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); + seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -433,33 +361,15 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(9); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - - seqInterface.getArray()[5] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *) 0 ).getTypeName(); - - seqInterface.getArray()[6] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *) 0 ).getTypeName(); - - seqInterface.getArray()[7] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *) 0 ).getTypeName(); - - seqInterface.getArray()[8] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); + seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); + seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); + seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); + seqInterface.getArray()[8] = Interface9::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, @@ -490,36 +400,16 @@ SAL_THROW( () ) { ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(10); - seqInterface.getArray()[0] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface1 > *) 0 ).getTypeName(); - - seqInterface.getArray()[1] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface2 > *) 0 ).getTypeName(); - - seqInterface.getArray()[2] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface3 > *) 0 ).getTypeName(); - - seqInterface.getArray()[3] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface4 > *) 0 ).getTypeName(); - - seqInterface.getArray()[4] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface5 > *) 0 ).getTypeName(); - - seqInterface.getArray()[5] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface6 > *) 0 ).getTypeName(); - - seqInterface.getArray()[6] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface7 > *) 0 ).getTypeName(); - - seqInterface.getArray()[7] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface8 > *) 0 ).getTypeName(); - - seqInterface.getArray()[8] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface9 > *) 0 ).getTypeName(); - - seqInterface.getArray()[9] = - ::getCppuType( (::com::sun::star::uno::Reference< Interface10 > *) 0 ).getTypeName(); - + seqInterface.getArray()[0] = Interface1::static_type().getTypeName(); + seqInterface.getArray()[1] = Interface2::static_type().getTypeName(); + seqInterface.getArray()[2] = Interface3::static_type().getTypeName(); + seqInterface.getArray()[3] = Interface4::static_type().getTypeName(); + seqInterface.getArray()[4] = Interface5::static_type().getTypeName(); + seqInterface.getArray()[5] = Interface6::static_type().getTypeName(); + seqInterface.getArray()[6] = Interface7::static_type().getTypeName(); + seqInterface.getArray()[7] = Interface8::static_type().getTypeName(); + seqInterface.getArray()[8] = Interface9::static_type().getTypeName(); + seqInterface.getArray()[9] = Interface10::static_type().getTypeName(); return createStandardClassWithSequence( rSMgr, sImplementationName, diff -Naur OOo-build-orig/cppuhelper/prj/d.lst OOo-build/cppuhelper/prj/d.lst --- OOo-build-orig/cppuhelper/prj/d.lst 2004-01-28 09:44:10.000000000 -0600 +++ OOo-build/cppuhelper/prj/d.lst 2005-04-26 23:59:59.000000000 -0500 @@ -60,6 +60,8 @@ ..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libcppuhelper*.so* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libcppuhelperC52.so.3 %_DEST%\lib%_EXT%\libcppuhelper3C52.so +..\%__SRC%\lib\libcppuhelpergcc3.so.3 %_DEST%\lib%_EXT%\libcppuhelper3gcc3.so ..\%__SRC%\lib\libcppuhelper*.dylib* %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib%_EXT%\* diff -Naur OOo-build-orig/dbaccess/source/core/dataaccess/SharedConnection.hxx OOo-build/dbaccess/source/core/dataaccess/SharedConnection.hxx --- OOo-build-orig/dbaccess/source/core/dataaccess/SharedConnection.hxx 2002-08-12 04:21:58.000000000 -0500 +++ OOo-build/dbaccess/source/core/dataaccess/SharedConnection.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -200,8 +200,10 @@ virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - + +#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection ); +#endif //........................................................................ } // namespace dbaccess //........................................................................ diff -Naur OOo-build-orig/desktop/source/app/app.cxx OOo-build/desktop/source/app/app.cxx --- OOo-build-orig/desktop/source/app/app.cxx 2004-03-02 04:06:34.000000000 -0600 +++ OOo-build/desktop/source/app/app.cxx 2005-04-26 23:59:59.000000000 -0500 @@ -478,7 +478,10 @@ { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pArgs ) - pArgs = new CommandLineArgs( ::vos::OExtCommandLine() ); + { + ::vos::OExtCommandLine aArgs; + pArgs = new CommandLineArgs( aArgs ); + } } return pArgs; diff -Naur OOo-build-orig/extensions/source/plugin/inc/plugin/plctrl.hxx OOo-build/extensions/source/plugin/inc/plugin/plctrl.hxx --- OOo-build-orig/extensions/source/plugin/inc/plugin/plctrl.hxx 2003-06-30 10:14:41.000000000 -0500 +++ OOo-build/extensions/source/plugin/inc/plugin/plctrl.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -173,9 +173,9 @@ virtual Reference< XInterface > SAL_CALL getContext() throw( RuntimeException ) { return _xContext; } - virtual sal_Bool SAL_CALL setModel( const Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException ) = NULL; + virtual sal_Bool SAL_CALL setModel( const Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException ) = 0; // { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; } - virtual Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( RuntimeException ) = NULL; + virtual Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( RuntimeException ) = 0; virtual Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( RuntimeException ) { return (::com::sun::star::awt::XView*)this; } diff -Naur OOo-build-orig/forms/source/component/GroupManager.hxx OOo-build/forms/source/component/GroupManager.hxx --- OOo-build-orig/forms/source/component/GroupManager.hxx 2003-03-25 12:01:17.000000000 -0600 +++ OOo-build/forms/source/component/GroupManager.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -128,7 +128,7 @@ template sal_Int32 insert_sorted(::std::vector& _rArray, const ELEMENT& _rNewElement, const LESS_COMPARE& _rCompareOp) { - ::std::vector::iterator aInsertPos = lower_bound( + typename ::std::vector::iterator aInsertPos = lower_bound( _rArray.begin(), _rArray.end(), _rNewElement, @@ -141,7 +141,7 @@ template sal_Bool seek_entry(const ::std::vector& _rArray, const ELEMENT& _rNewElement, sal_Int32& nPos, const LESS_COMPARE& _rCompareOp) { - ::std::vector::const_iterator aExistentPos = ::std::lower_bound( + typename ::std::vector::const_iterator aExistentPos = lower_bound( _rArray.begin(), _rArray.end(), _rNewElement, diff -Naur OOo-build-orig/framework/inc/classes/addonmenu.hxx OOo-build/framework/inc/classes/addonmenu.hxx --- OOo-build-orig/framework/inc/classes/addonmenu.hxx 2003-04-04 11:11:47.000000000 -0600 +++ OOo-build/framework/inc/classes/addonmenu.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -120,7 +120,7 @@ rtl::OUString m_aCommandURL; ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& m_xFrame; - friend AddonMenuManager; + friend class AddonMenuManager; }; class AddonMenuManager diff -Naur OOo-build-orig/icu/icu-2.2.patch OOo-build/icu/icu-2.2.patch --- OOo-build-orig/icu/icu-2.2.patch 2004-07-06 05:40:19.000000000 -0500 +++ OOo-build/icu/icu-2.2.patch 2005-04-26 23:59:59.000000000 -0500 @@ -17,16 +17,6 @@ echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6 case "${host}" in alpha*-*-*) U_HAVE_INTTYPES_H=0; -*************** -*** 2964,2969 **** ---- 2964,2970 ---- - #ifndef __USE_POSIX - #define __USE_POSIX - #endif -+ #include - #include - #ifndef tzname /* For SGI. */ - extern char *tzname[]; /* RS6000 and others reject char **tzname. */ *** misc/icu/source/configure.in Fri Aug 9 19:20:56 2002 --- misc/build/icu/source/configure.in Tue Jul 22 10:11:48 2003 *************** @@ -46,16 +36,6 @@ AC_MSG_RESULT("C compiler set to CCC ${CC}" ) case "${host}" in alpha*-*-*) U_HAVE_INTTYPES_H=0; -*************** -*** 448,453 **** ---- 448,454 ---- - <<#ifndef __USE_POSIX - #define __USE_POSIX - #endif -+ #include - #include - #ifndef tzname /* For SGI. */ - extern char *tzname[]; /* RS6000 and others reject char **tzname. */ *** misc/icu/source/icudefs.mk.in Wed Jul 31 22:28:32 2002 --- misc/build/icu/source/icudefs.mk.in Tue Jul 22 10:11:49 2003 *************** @@ -130,6 +110,20 @@ /** * Create BreakIterator for line-breaks using specified locale. +*** misc/icu/source/common/unicode/locid.h 2004-05-05 17:24:14.299356195 -0400 +--- misc/build/icu/source/common/unicode/locid.h 2002-08-01 19:21:36.000000000 -0400 +*************** +*** 728,734 **** +--- 728,736 ---- + #ifdef ICU_LOCID_USE_DEPRECATES + static Locale fgDefaultLocale; + #else ++ # if (__GNUC_MINOR__ < 4) && (__GNUC__ <= 3) + friend struct LocaleProxy; ++ # endif + #endif + + static const Locale &getLocale(int locid); *** misc/icu/source/config/mh-darwin Wed May 29 18:45:06 2002 --- misc/build/icu/source/config/mh-darwin Tue Jul 22 10:11:48 2003 *************** diff -Naur OOo-build-orig/icu/makefile.mk OOo-build/icu/makefile.mk --- OOo-build-orig/icu/makefile.mk 2003-07-16 12:26:10.000000000 -0500 +++ OOo-build/icu/makefile.mk 2005-04-27 00:00:02.000000000 -0500 @@ -93,7 +93,7 @@ CONFIGURE_DIR=source -CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' +CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no --enable-extras=no' #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no CONFIGURE_FLAGS= diff -Naur OOo-build-orig/idl/inc/hash.hxx OOo-build/idl/inc/hash.hxx --- OOo-build-orig/idl/inc/hash.hxx 2000-09-18 11:30:41.000000000 -0500 +++ OOo-build/idl/inc/hash.hxx 2005-04-26 23:59:59.000000000 -0500 @@ -99,7 +99,7 @@ class SvStringHashTable; class SvStringHashEntry : public SvRefBase { -friend SvStringHashTable; +friend class SvStringHashTable; ByteString aName; UINT32 nHashId; ULONG nValue; diff -Naur OOo-build-orig/psprint/source/helper/ppdparser.cxx OOo-build/psprint/source/helper/ppdparser.cxx --- OOo-build-orig/psprint/source/helper/ppdparser.cxx 2004-02-19 04:58:29.000000000 -0600 +++ OOo-build/psprint/source/helper/ppdparser.cxx 2005-04-26 23:59:59.000000000 -0500 @@ -67,7 +67,7 @@ // define a hash for PPDKey namespace psp { class PPDKey; } -struct std::hash< const psp::PPDKey* > +template<> struct std::hash< const psp::PPDKey* > { size_t operator()( const psp::PPDKey * pKey) const { return (size_t)pKey; } diff -Naur OOo-build-orig/pyuno/source/module/makefile.mk OOo-build/pyuno/source/module/makefile.mk --- OOo-build-orig/pyuno/source/module/makefile.mk 2004-05-03 11:48:10.000000000 -0500 +++ OOo-build/pyuno/source/module/makefile.mk 2005-04-26 23:59:59.000000000 -0500 @@ -63,6 +63,8 @@ TARGET=pyuno ENABLE_EXCEPTIONS=TRUE +LINKFLAGSDEFS = # do not fail with missing symbols + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk diff -Naur OOo-build-orig/sablot/Sablot-0.52.patch OOo-build/sablot/Sablot-0.52.patch --- OOo-build-orig/sablot/Sablot-0.52.patch 2003-08-05 04:41:11.000000000 -0500 +++ OOo-build/sablot/Sablot-0.52.patch 2005-04-26 23:59:59.000000000 -0500 @@ -1,9 +1,66 @@ +*** misc/Sablot-0.52/Sablot/engine/datastr.h 2001-03-29 03:19:53.000000000 -0500 +--- misc/build/Sablot-0.52/Sablot/engine/datastr.h 2004-05-07 15:54:49.355554612 -0400 +*************** +*** 752,758 **** + * but need to use swap() to drag extra pointers along + */ + for (k = ceiling - 1; k >= bottom && compare(k, k + 1) > 0; k--) +! swap(k, k+1); + } + } + +--- 752,758 ---- + * but need to use swap() to drag extra pointers along + */ + for (k = ceiling - 1; k >= bottom && compare(k, k + 1) > 0; k--) +! SList::swap(k, k+1); + } + } + +*************** +*** 760,768 **** + void SList::qsPartition(int& bottom, int& top) + { + int middle = (bottom + top) >> 1; +! if (compare(bottom, top) > 0) swap(bottom, top); +! if (compare(middle, top) > 0) swap(middle, top); +! if (compare(bottom, middle) > 0) swap(bottom, middle); + // T pivot = List::block[middle]; + while (bottom <= top) + { +--- 760,768 ---- + void SList::qsPartition(int& bottom, int& top) + { + int middle = (bottom + top) >> 1; +! if (compare(bottom, top) > 0) SList::swap(bottom, top); +! if (compare(middle, top) > 0) SList::swap(middle, top); +! if (compare(bottom, middle) > 0) SList::swap(bottom, middle); + // T pivot = List::block[middle]; + while (bottom <= top) + { +*************** +*** 776,782 **** + middle = top; + else if (middle == top) + middle = bottom; +! swap(bottom, top); + } + } + } +--- 776,782 ---- + middle = top; + else if (middle == top) + middle = bottom; +! SList::swap(bottom, top); + } + } + } *** misc/Sablot-0.52/Sablot/engine/makefile.mk Mon Aug 4 14:28:03 2003 --- misc/build/Sablot-0.52/Sablot/engine/makefile.mk Mon Aug 4 14:17:39 2003 *************** *** 1 **** ! dummy ---- 1,163 ---- +--- 1,164 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -83,6 +140,7 @@ ! ! .IF "$(OS)"=="SOLARIS" ! CFLAGS+= -DHAVE_IEEEFP_H -DHAVE_UNISTD_H +! CFLAGSCXX+=-instances=static ! .ENDIF ! ! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX" || "$(OS)"=="NETBSD" diff -Naur OOo-build-orig/sal/inc/osl/mutex.hxx OOo-build/sal/inc/osl/mutex.hxx --- OOo-build-orig/sal/inc/osl/mutex.hxx 2003-04-04 11:10:54.000000000 -0600 +++ OOo-build/sal/inc/osl/mutex.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -245,8 +245,8 @@ { if( pResetT ) { - pT = pResetT; - pT->acquire(); + ResettableGuard< T >::pT = pResetT; + ResettableGuard< T >::pT->acquire(); } } }; diff -Naur OOo-build-orig/sal/inc/rtl/instance.hxx OOo-build/sal/inc/rtl/instance.hxx --- OOo-build-orig/sal/inc/rtl/instance.hxx 2003-05-22 04:32:56.000000000 -0500 +++ OOo-build/sal/inc/rtl/instance.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -343,7 +343,7 @@ p = m_pInstance; if (!p) { - p = aInstCtor(data); + p = aInstCtor(aData); OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); m_pInstance = p; } diff -Naur OOo-build-orig/sc/inc/chgtrack.hxx OOo-build/sc/inc/chgtrack.hxx --- OOo-build-orig/sc/inc/chgtrack.hxx 2004-01-09 08:40:23.000000000 -0600 +++ OOo-build/sc/inc/chgtrack.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -714,11 +714,7 @@ class ScChangeActionMove : public ScChangeAction { friend class ScChangeTrack; -#ifdef IRIX friend class ScChangeActionDel; -#else - friend void ScChangeActionDel::UndoCutOffMoves(); -#endif ScBigRange aFromRange; ScChangeTrack* pTrack; @@ -1013,11 +1009,7 @@ class ScChangeActionReject : public ScChangeAction { friend class ScChangeTrack; -#ifdef IRIX friend class ScChangeActionContent; -#else - friend BOOL ScChangeActionContent::Select( ScDocument*, ScChangeTrack*, BOOL, Stack* ); -#endif ScChangeActionReject( ULONG nReject ) : ScChangeAction( SC_CAT_REJECT, ScRange() ) diff -Naur OOo-build-orig/sc/inc/scextopt.hxx OOo-build/sc/inc/scextopt.hxx --- OOo-build-orig/sc/inc/scextopt.hxx 2003-03-26 12:03:36.000000000 -0600 +++ OOo-build/sc/inc/scextopt.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -140,7 +140,7 @@ { // Code: colrowst.cxx private: - friend ColRowSettings; + friend class ColRowSettings; // Window -Info ScExtTabOptions** ppExtTabOpts; diff -Naur OOo-build-orig/sc/source/filter/inc/colrowst.hxx OOo-build/sc/source/filter/inc/colrowst.hxx --- OOo-build-orig/sc/source/filter/inc/colrowst.hxx 2003-05-21 03:01:14.000000000 -0500 +++ OOo-build/sc/source/filter/inc/colrowst.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -93,7 +93,7 @@ { private: // ACHTUNG: Col-/Row-Angaben in TWIPS - friend ScExtDocOptions; + friend class ScExtDocOptions; ScfUInt16List* pHorizPb; // horizontale Seitenumbrueche ScfUInt16List* pVertPb; // vertikale ~ diff -Naur OOo-build-orig/sc/source/filter/inc/dif.hxx OOo-build/sc/source/filter/inc/dif.hxx --- OOo-build-orig/sc/source/filter/inc/dif.hxx 2003-03-26 12:04:58.000000000 -0600 +++ OOo-build/sc/source/filter/inc/dif.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -208,7 +208,7 @@ class DifColumn : private List { private: - friend DifAttrCache; + friend class DifAttrCache; struct ENTRY { UINT32 nNumFormat; diff -Naur OOo-build-orig/sc/source/filter/inc/lotattr.hxx OOo-build/sc/source/filter/inc/lotattr.hxx --- OOo-build-orig/sc/source/filter/inc/lotattr.hxx 2000-09-18 11:45:13.000000000 -0500 +++ OOo-build/sc/source/filter/inc/lotattr.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -109,7 +109,7 @@ class LotAttrCache : private List { private: - friend LotAttrTable; + friend class LotAttrTable; struct ENTRY { diff -Naur OOo-build-orig/sc/source/filter/inc/lotrange.hxx OOo-build/sc/source/filter/inc/lotrange.hxx --- OOo-build-orig/sc/source/filter/inc/lotrange.hxx 2000-09-18 11:45:13.000000000 -0500 +++ OOo-build/sc/source/filter/inc/lotrange.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -75,7 +75,7 @@ class LotusRange { - friend LotusRangeList; + friend class LotusRangeList; private: UINT32 nHash; UINT16 nColStart; diff -Naur OOo-build-orig/sc/source/filter/inc/namebuff.hxx OOo-build/sc/source/filter/inc/namebuff.hxx --- OOo-build-orig/sc/source/filter/inc/namebuff.hxx 2004-09-24 04:21:16.000000000 -0500 +++ OOo-build/sc/source/filter/inc/namebuff.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -89,7 +89,7 @@ class StringHashEntry { private: - friend NameBuffer; + friend class NameBuffer; String aString; UINT32 nHash; diff -Naur OOo-build-orig/sc/source/filter/inc/xcl97rec.hxx OOo-build/sc/source/filter/inc/xcl97rec.hxx --- OOo-build-orig/sc/source/filter/inc/xcl97rec.hxx 2003-11-14 05:04:06.000000000 -0600 +++ OOo-build/sc/source/filter/inc/xcl97rec.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -655,7 +655,7 @@ class XclCf : public ExcRecord, protected XclExpRoot { private: - friend XclCondFormat; + friend class XclCondFormat; sal_Char* pVarData; // formats + formulas UINT16 nVarLen; // len of attributes + formulas diff -Naur OOo-build-orig/sc/source/ui/inc/AccessibleText.hxx OOo-build/sc/source/ui/inc/AccessibleText.hxx --- OOo-build-orig/sc/source/ui/inc/AccessibleText.hxx 2003-03-26 12:06:09.000000000 -0600 +++ OOo-build/sc/source/ui/inc/AccessibleText.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -97,18 +97,18 @@ ScAccessibleTextData() {} virtual ~ScAccessibleTextData() {} - virtual ScAccessibleTextData* Clone() const = NULL; + virtual ScAccessibleTextData* Clone() const = 0; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) {} - virtual SvxTextForwarder* GetTextForwarder() = NULL; - virtual SvxViewForwarder* GetViewForwarder() = NULL; - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = NULL; + virtual SvxTextForwarder* GetTextForwarder() = 0; + virtual SvxViewForwarder* GetViewForwarder() = 0; + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = 0; virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } - virtual void UpdateData() = NULL; - virtual void SetDoUpdate(sal_Bool bValue) = NULL; - virtual sal_Bool IsDirty() const = NULL; + virtual void UpdateData() = 0; + virtual void SetDoUpdate(sal_Bool bValue) = 0; + virtual sal_Bool IsDirty() const = 0; private: mutable SfxBroadcaster maBroadcaster; diff -Naur OOo-build-orig/scaddins/source/analysis/analysishelper.hxx OOo-build/scaddins/source/analysis/analysishelper.hxx --- OOo-build-orig/scaddins/source/analysis/analysishelper.hxx 2003-06-04 05:31:56.000000000 -0500 +++ OOo-build/scaddins/source/analysis/analysishelper.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -614,7 +614,7 @@ class ConvertData { protected: - friend ConvertDataList; + friend class ConvertDataList; double fConst; STRING aName; ConvertDataClass eClass; diff -Naur OOo-build-orig/setup2/inc/chainwidthbuilder.hxx OOo-build/setup2/inc/chainwidthbuilder.hxx --- OOo-build-orig/setup2/inc/chainwidthbuilder.hxx 2002-08-16 05:47:28.000000000 -0500 +++ OOo-build/setup2/inc/chainwidthbuilder.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -118,7 +118,7 @@ m_pNewSize = new sal_Int32[nValues]; sal_Int32 i = 0; - for (std::vector::iterator it = m_aList.begin(); + for (typename std::vector::iterator it = m_aList.begin(); it != m_aList.end(); it++) { diff -Naur OOo-build-orig/sfx2/source/bastyp/minarray.cxx OOo-build/sfx2/source/bastyp/minarray.cxx --- OOo-build-orig/sfx2/source/bastyp/minarray.cxx 2000-09-18 11:52:28.000000000 -0500 +++ OOo-build/sfx2/source/bastyp/minarray.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -102,7 +102,7 @@ SfxPtrArr::~SfxPtrArr() { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; } // ----------------------------------------------------------------------- @@ -111,7 +111,7 @@ { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; nUsed = rOrig.nUsed; nGrow = rOrig.nGrow; @@ -142,7 +142,7 @@ { DBG_ASSERT( nUsed <= nNewSize, "" ); memmove( pNewData, pData, sizeof(void*)*nUsed ); - __DELETE (DEL_ARRAY (nUsed)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; @@ -169,7 +169,7 @@ // bleibt vielleicht keiner uebrig if ( (nUsed-nLen) == 0 ) { - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = 0; nUsed = 0; nUnused = 0; @@ -193,7 +193,7 @@ if ( nNewUsed != nPos ) memmove( pNewData+nPos, pData+nPos+nLen, sizeof(void*)*(nNewUsed-nPos) ); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = pNewData; nUsed = nNewUsed; nUnused = nNewSize - nNewUsed; @@ -283,7 +283,7 @@ { DBG_ASSERT( nUsed < nNewSize, "" ); memmove( pNewData, pData, sizeof(void*)*nUsed ); - __DELETE (DEL_ARRAY (nUsed)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; @@ -338,7 +338,7 @@ ByteArr::~ByteArr() { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; } // ----------------------------------------------------------------------- @@ -347,7 +347,7 @@ { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; nUsed = rOrig.nUsed; nGrow = rOrig.nGrow; @@ -377,7 +377,7 @@ { DBG_ASSERT( nUsed <= nNewSize, "" ); memmove( pNewData, pData, sizeof(char)*nUsed ); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; @@ -404,7 +404,7 @@ // bleibt vielleicht keiner uebrig if ( (nUsed-nLen) == 0 ) { - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = 0; nUsed = 0; nUnused = 0; @@ -428,7 +428,7 @@ if ( nNewUsed != nPos ) memmove( pNewData+nPos, pData+nPos+nLen, sizeof(char)*(nNewUsed-nPos) ); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = pNewData; nUsed = nNewUsed; nUnused = nNewSize - nNewUsed; @@ -497,7 +497,7 @@ { DBG_ASSERT( nUsed < nNewSize, "" ); memmove( pNewData, pData, sizeof(char)*nUsed ); - __DELETE (DEL_ARRAY (nUsed)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; @@ -570,7 +570,7 @@ WordArr::~WordArr() { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; } // ----------------------------------------------------------------------- @@ -579,7 +579,7 @@ { DBG_MEMTEST(); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; nUsed = rOrig.nUsed; nGrow = rOrig.nGrow; @@ -609,7 +609,7 @@ { DBG_ASSERT( nUsed <= nNewSize, " " ); memmove( pNewData, pData, sizeof(short)*nUsed ); - __DELETE (DEL_ARRAY (nUsed)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; @@ -636,7 +636,7 @@ // bleibt vielleicht keiner uebrig if ( (nUsed-nLen) == 0 ) { - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = 0; nUsed = 0; nUnused = 0; @@ -660,7 +660,7 @@ if ( nNewUsed != nPos ) memmove( pNewData+nPos, pData+nPos+nLen, sizeof(short)*(nNewUsed-nPos) ); - __DELETE (DEL_ARRAY (nUsed+nUnused)) pData; + delete [] pData; pData = pNewData; nUsed = nNewUsed; nUnused = nNewSize - nNewUsed; @@ -729,7 +729,7 @@ { DBG_ASSERT( nUsed < nNewSize, "" ); memmove( pNewData, pData, sizeof(short)*nUsed ); - __DELETE (DEL_ARRAY (nUsed)) pData; + delete [] pData; } nUnused = nNewSize-nUsed; pData = pNewData; diff -Naur OOo-build-orig/sfx2/source/control/dispatch.cxx OOo-build/sfx2/source/control/dispatch.cxx --- OOo-build-orig/sfx2/source/control/dispatch.cxx 2003-03-27 05:27:53.000000000 -0600 +++ OOo-build/sfx2/source/control/dispatch.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -1294,7 +1294,7 @@ const SfxPoolItem* pRet = Execute( rItem.GetSlot(), rItem.GetCallMode(), pPtr, rItem.GetModifier() ); - __DELETE(rItem.Count() + 1) (SfxPoolItem**)pPtr; + delete [] (SfxPoolItem**)pPtr; return pRet; } diff -Naur OOo-build-orig/sfx2/source/inc/cfg.hxx OOo-build/sfx2/source/inc/cfg.hxx --- OOo-build-orig/sfx2/source/inc/cfg.hxx 2003-04-17 10:22:13.000000000 -0500 +++ OOo-build/sfx2/source/inc/cfg.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -343,7 +343,7 @@ class SfxAcceleratorConfigPage : public SfxTabPage { - friend SfxAccCfgTabListBox_Impl; + friend class SfxAccCfgTabListBox_Impl; private: const SfxMacroInfoItem* m_pMacroInfoItem; SfxAccCfgTabListBox_Impl aEntriesBox; diff -Naur OOo-build-orig/sfx2/source/inc/scriptcont.hxx OOo-build/sfx2/source/inc/scriptcont.hxx --- OOo-build-orig/sfx2/source/inc/scriptcont.hxx 2003-03-27 05:28:30.000000000 -0600 +++ OOo-build/sfx2/source/inc/scriptcont.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -182,7 +182,7 @@ class SfxScriptLibrary : public SfxLibrary_Impl { - friend SfxScriptLibraryContainer; + friend class SfxScriptLibraryContainer; sal_Bool mbLoadedSource; sal_Bool mbLoadedBinary; diff -Naur OOo-build-orig/sfx2/source/menu/virtmenu.cxx OOo-build/sfx2/source/menu/virtmenu.cxx --- OOo-build-orig/sfx2/source/menu/virtmenu.cxx 2003-05-28 08:25:16.000000000 -0500 +++ OOo-build/sfx2/source/menu/virtmenu.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -349,7 +349,7 @@ (pItems+n)->SfxMenuControl::~SfxMenuControl(); delete (void*) pItems; #else - __DELETE(nCount) pItems; + delete [] pItems; #endif } diff -Naur OOo-build-orig/sfx2/source/toolbox/tbxcust.cxx OOo-build/sfx2/source/toolbox/tbxcust.cxx --- OOo-build-orig/sfx2/source/toolbox/tbxcust.cxx 2003-05-15 05:54:28.000000000 -0500 +++ OOo-build/sfx2/source/toolbox/tbxcust.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -580,10 +580,14 @@ return 0; } -struct std::hash< SfxConfigManager* > +namespace std { +template<> struct hash< SfxConfigManager* > { size_t operator()(const SfxConfigManager* __s) const { return (size_t)__s; } }; + + +} // namespace std struct SfxConfigManagerPtrEqual { diff -Naur OOo-build-orig/sfx2/source/view/printer.cxx OOo-build/sfx2/source/view/printer.cxx --- OOo-build-orig/sfx2/source/view/printer.cxx 2003-05-28 07:26:31.000000000 -0500 +++ OOo-build/sfx2/source/view/printer.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -203,7 +203,7 @@ else { // statische Font-Sizes verwenden - __DELETE(nSizeCount) pSizes; + delete [] pSizes; nSizes = 0; } rDev.SetMapMode(aOldMapMode); @@ -222,7 +222,7 @@ SfxFontSizeInfo::~SfxFontSizeInfo() { - __DELETE(nSizes) pSizes; + delete [] pSizes; } //-------------------------------------------------------------------- diff -Naur OOo-build-orig/solenv/bin/gccinstlib.pl OOo-build/solenv/bin/gccinstlib.pl --- OOo-build-orig/solenv/bin/gccinstlib.pl 2004-08-27 04:55:21.000000000 -0500 +++ OOo-build/solenv/bin/gccinstlib.pl 2005-04-27 00:00:02.000000000 -0500 @@ -63,7 +63,7 @@ # #************************************************************************* -$ENV{'LC_MESSAGES'} = 'C'; +$ENV{'LC_ALL'} = 'C'; %SearchDirs = GetGccSearchDirs (); diff -Naur OOo-build-orig/solenv/inc/tg_compv.mk OOo-build/solenv/inc/tg_compv.mk --- OOo-build-orig/solenv/inc/tg_compv.mk 2004-01-09 12:59:11.000000000 -0600 +++ OOo-build/solenv/inc/tg_compv.mk 2005-04-27 00:00:00.000000000 -0500 @@ -134,6 +134,10 @@ SHORTSTDCPP3="5" .ENDIF +.IF "$(CCNUMVER)">="000300040000" +SHORTSTDCPP3="6" +.ENDIF + .ENDIF .ENDIF diff -Naur OOo-build-orig/soltools/inc/st_list.hxx OOo-build/soltools/inc/st_list.hxx --- OOo-build-orig/soltools/inc/st_list.hxx 2003-07-16 12:27:41.000000000 -0500 +++ OOo-build/soltools/inc/st_list.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -305,8 +305,8 @@ DynamicList::DynamicList( const DynamicList & i_rList ) : ST_List< XY* >(i_rList) { - for ( typename DynamicList::iterator it = begin(); - it != end(); + for ( typename DynamicList::iterator it = DynamicList::begin(); + it != DynamicList::end(); ++it ) { // Copying the contents the pointers point at: @@ -317,7 +317,7 @@ template DynamicList::~DynamicList() { - erase_all(); + DynamicList::erase_all(); } template @@ -338,24 +338,24 @@ void DynamicList::Insert(unsigned pos, XY * const & elem) { - if ( pos > len ) + if ( pos > DynamicList::len ) return; - checkSize(len+2); - memmove( inhalt+pos+1, inhalt+pos, (len-pos) * sizeof(XY*) ); - inhalt[pos] = elem; - len++; + checkSize(DynamicList::len+2); + memmove( DynamicList::inhalt+pos+1, DynamicList::inhalt+pos, (DynamicList::len-pos) * sizeof(XY*) ); + DynamicList::inhalt[pos] = elem; + DynamicList::len++; } template void DynamicList::Remove( unsigned pos ) { - if (!is_valid_index(pos) ) + if (!DynamicList::is_valid_index(pos) ) return; - len--; - delete inhalt[pos]; - memmove(inhalt+pos, inhalt+pos+1, (len-pos) * sizeof(XY*) ); + DynamicList::len--; + delete DynamicList::inhalt[pos]; + memmove(DynamicList::inhalt+pos, DynamicList::inhalt+pos+1, (DynamicList::len-pos) * sizeof(XY*) ); } diff -Naur OOo-build-orig/stoc/source/corereflection/lrucache.hxx OOo-build/stoc/source/corereflection/lrucache.hxx --- OOo-build-orig/stoc/source/corereflection/lrucache.hxx 2000-11-22 19:55:21.000000000 -0600 +++ OOo-build/stoc/source/corereflection/lrucache.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -189,7 +189,7 @@ inline sal_Bool LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::hasValue( const t_Key & rKey ) const { ::osl::MutexGuard aGuard( _aCacheMutex ); - const t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); + const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); return (iFind != _aKey2Element.end()); } //__________________________________________________________________________________________________ @@ -197,7 +197,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t_Key & rKey ) const { ::osl::MutexGuard aGuard( _aCacheMutex ); - const t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); + const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); if (iFind != _aKey2Element.end()) { CacheEntry * pEntry = (*iFind).second; @@ -219,7 +219,7 @@ if (_nCachedElements > 0) { ::osl::MutexGuard aGuard( _aCacheMutex ); - const t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); + const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); CacheEntry * pEntry; if (iFind == _aKey2Element.end()) diff -Naur OOo-build-orig/stoc/source/defaultregistry/defaultregistry.cxx OOo-build/stoc/source/defaultregistry/defaultregistry.cxx --- OOo-build-orig/stoc/source/defaultregistry/defaultregistry.cxx 2001-12-07 09:37:29.000000000 -0600 +++ OOo-build/stoc/source/defaultregistry/defaultregistry.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -183,7 +183,7 @@ virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); - friend NestedKeyImpl; + friend class NestedKeyImpl; protected: Mutex m_mutex; sal_uInt32 m_state; diff -Naur OOo-build-orig/stoc/source/security/lru_cache.h OOo-build/stoc/source/security/lru_cache.h --- OOo-build-orig/stoc/source/security/lru_cache.h 2002-03-04 11:43:21.000000000 -0600 +++ OOo-build/stoc/source/security/lru_cache.h 2005-04-27 00:00:00.000000000 -0500 @@ -214,7 +214,7 @@ inline bool lru_cache< t_key, t_val, t_hashKey, t_equalKey >::has( t_key const & key ) const SAL_THROW( () ) { - t_key2element::const_iterator const iFind( m_key2element.find( key ) ); + typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); return (iFind != m_key2element.end()); } //__________________________________________________________________________________________________ @@ -224,7 +224,7 @@ { if (0 < m_size) { - t_key2element::const_iterator const iFind( m_key2element.find( key ) ); + typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); if (iFind != m_key2element.end()) { Entry * entry = iFind->second; @@ -250,7 +250,7 @@ { if (0 < m_size) { - t_key2element::const_iterator const iFind( m_key2element.find( key ) ); + typename t_key2element::const_iterator const iFind( m_key2element.find( key ) ); Entry * entry; if (iFind == m_key2element.end()) @@ -270,8 +270,8 @@ #endif m_key2element.erase( entry->m_key ); entry->m_key = key; - ::std::pair< t_key2element::iterator, bool > insertion( - m_key2element.insert( t_key2element::value_type( key, entry ) ) ); + ::std::pair< typename t_key2element::iterator, bool > insertion( + m_key2element.insert( typename t_key2element::value_type( key, entry ) ) ); #ifdef __CACHE_DIAGNOSE OSL_ENSURE( insertion.second, "### inserting new cache entry failed?!" ); #endif diff -Naur OOo-build-orig/stoc/source/simpleregistry/simpleregistry.cxx OOo-build/stoc/source/simpleregistry/simpleregistry.cxx --- OOo-build-orig/stoc/source/simpleregistry/simpleregistry.cxx 2002-10-21 10:26:05.000000000 -0500 +++ OOo-build/stoc/source/simpleregistry/simpleregistry.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -175,7 +175,7 @@ virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException); virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException); - friend RegistryKeyImpl; + friend class RegistryKeyImpl; protected: Mutex m_mutex; OUString m_url; diff -Naur OOo-build-orig/stoc/source/tdmanager/lrucache.hxx OOo-build/stoc/source/tdmanager/lrucache.hxx --- OOo-build-orig/stoc/source/tdmanager/lrucache.hxx 2001-05-10 09:35:25.000000000 -0500 +++ OOo-build/stoc/source/tdmanager/lrucache.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -191,7 +191,7 @@ t_Key const & rKey ) const { ::osl::MutexGuard aGuard( _aCacheMutex ); - t_Key2Element::const_iterator const iFind( _aKey2Element.find( rKey ) ); + typename t_Key2Element::const_iterator const iFind( _aKey2Element.find( rKey ) ); return (iFind != _aKey2Element.end()); } //__________________________________________________________________________________________________ @@ -200,7 +200,7 @@ t_Key const & rKey ) const { ::osl::MutexGuard aGuard( _aCacheMutex ); - const t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); + const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); if (iFind != _aKey2Element.end()) { CacheEntry * pEntry = (*iFind).second; @@ -222,7 +222,7 @@ if (_nCachedElements > 0) { ::osl::MutexGuard aGuard( _aCacheMutex ); - t_Key2Element::const_iterator const iFind( _aKey2Element.find( rKey ) ); + typename t_Key2Element::const_iterator const iFind( _aKey2Element.find( rKey ) ); CacheEntry * pEntry; if (iFind == _aKey2Element.end()) diff -Naur OOo-build-orig/stoc/source/tdmanager/tdmgr.cxx OOo-build/stoc/source/tdmanager/tdmgr.cxx --- OOo-build-orig/stoc/source/tdmanager/tdmgr.cxx 2002-11-11 02:33:38.000000000 -0600 +++ OOo-build/stoc/source/tdmanager/tdmgr.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -199,8 +199,8 @@ XTypeDescriptionEnumerationAccess, XInitialization > { - friend EnumerationImpl; - friend EventListenerImpl; + friend class EnumerationImpl; + friend class EventListenerImpl; Mutex _aComponentMutex; Reference< XComponentContext > _xContext; diff -Naur OOo-build-orig/store/inc/store/object.hxx OOo-build/store/inc/store/object.hxx --- OOo-build-orig/store/inc/store/object.hxx 2001-03-13 14:37:59.000000000 -0600 +++ OOo-build/store/inc/store/object.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -97,25 +97,6 @@ store_handle_type * SAL_CALL query ( IStoreHandle * pHandle, store_handle_type *); - -/** Template helper class as type safe Reference to store_handle_type. - */ -template -class OStoreHandle : public rtl::Reference -{ -public: - OStoreHandle (store_handle_type * pHandle) - : rtl::Reference (pHandle) - {} - - static store_handle_type * SAL_CALL query (void * pHandle) - { - return store::query ( - static_cast(pHandle), - static_cast(0)); - } -}; - /*======================================================================== * * OStoreObject interface. diff -Naur OOo-build-orig/store/source/store.cxx OOo-build/store/source/store.cxx --- OOo-build-orig/store/source/store.cxx 2001-03-13 14:49:56.000000000 -0600 +++ OOo-build/store/source/store.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -101,6 +101,28 @@ using rtl::Reference; using rtl::OString; +namespace store +{ +/** Template helper class as type safe Reference to store_handle_type. + */ +template +class OStoreHandle : public rtl::Reference +{ +public: + OStoreHandle (store_handle_type * pHandle) + : rtl::Reference (pHandle) + {} + + static store_handle_type * SAL_CALL query (void * pHandle) + { + return store::query ( + static_cast(pHandle), + static_cast(0)); + } +}; +} + + using namespace store; /*======================================================================== diff -Naur OOo-build-orig/svtools/inc/communi.hxx OOo-build/svtools/inc/communi.hxx --- OOo-build-orig/svtools/inc/communi.hxx 2003-03-27 08:36:07.000000000 -0600 +++ OOo-build/svtools/inc/communi.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -141,7 +141,7 @@ class CommunicationManagerServerViaSocket : public CommunicationManagerServer { - friend CommunicationManagerServerAcceptThread; + friend class CommunicationManagerServerAcceptThread; public: CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel = FALSE ); virtual ~CommunicationManagerServerViaSocket(); diff -Naur OOo-build-orig/svtools/source/contnr/svlbox.cxx OOo-build/svtools/source/contnr/svlbox.cxx --- OOo-build-orig/svtools/source/contnr/svlbox.cxx 2003-05-27 06:23:39.000000000 -0500 +++ OOo-build/svtools/source/contnr/svlbox.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -724,7 +724,7 @@ SvViewDataEntry::~SvViewDataEntry() { DBG_DTOR(SvViewDataEntry,0); - __DELETE(nItmCnt) pItemData; + delete [] pItemData; } // *************************************************************** diff -Naur OOo-build-orig/svtools/source/contnr/svtabbx.cxx OOo-build/svtools/source/contnr/svtabbx.cxx --- OOo-build-orig/svtools/source/contnr/svtabbx.cxx 2003-05-19 08:06:41.000000000 -0500 +++ OOo-build/svtools/source/contnr/svtabbx.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -186,7 +186,7 @@ SvTabListBox::~SvTabListBox() { // array-delete - __DELETE(nTabCount) pTabList; + delete [] pTabList; #ifdef DBG_UTIL pTabList = 0; nTabCount = 0; @@ -199,7 +199,7 @@ if( !pTabs ) return; - __DELETE(nTabCount) pTabList; + delete [] pTabList; USHORT nCount = (USHORT)(*pTabs); pTabList = new SvLBoxTab[ nCount ]; nTabCount = nCount; diff -Naur OOo-build-orig/svtools/source/dialogs/mcvmath.hxx OOo-build/svtools/source/dialogs/mcvmath.hxx --- OOo-build-orig/svtools/source/dialogs/mcvmath.hxx 2000-09-18 11:58:58.000000000 -0500 +++ OOo-build/svtools/source/dialogs/mcvmath.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -107,8 +107,8 @@ class Fix { private: - friend FixCpx; - friend ColWheel; + friend class FixCpx; + friend class ColWheel; // friend Fix ImpMultBig2( const Fix& a, const Fix& b ); diff -Naur OOo-build-orig/svtools/source/numbers/zformat.cxx OOo-build/svtools/source/numbers/zformat.cxx --- OOo-build-orig/svtools/source/numbers/zformat.cxx 2004-02-05 06:46:31.000000000 -0600 +++ OOo-build/svtools/source/numbers/zformat.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -380,8 +380,8 @@ { for (USHORT i = 0; i < nAnzStrings; i++) aI.sStrArray[i].Erase(); - __DELETE(nAnzStrings) aI.sStrArray; - __DELETE(nAnzStrings) aI.nTypeArray; + delete [] aI.sStrArray; + delete [] aI.nTypeArray; } void ImpSvNumFor::Enlarge(USHORT nAnz) diff -Naur OOo-build-orig/svtools/source/svrtf/svparser.cxx OOo-build/svtools/source/svrtf/svparser.cxx --- OOo-build-orig/svtools/source/svrtf/svparser.cxx 2003-03-27 08:39:43.000000000 -0600 +++ OOo-build/svtools/source/svrtf/svparser.cxx 2005-04-27 00:00:00.000000000 -0500 @@ -166,14 +166,7 @@ delete pImplData; -#ifdef MPW - // der MPW-Compiler ruft sonst keine Dtoren! - for (int n = 0; n < nTokenStackSize; ++n ) - (pTokenStack+n)->TokenStackType::~TokenStackType(); - delete (void*) pTokenStack; -#else - __DELETE(nTokenStackSize) pTokenStack; -#endif + delete [] pTokenStack; } void SvParser::ClearTxtConvContext() diff -Naur OOo-build-orig/svx/inc/AccessibleShapeInfo.hxx OOo-build/svx/inc/AccessibleShapeInfo.hxx --- OOo-build-orig/svx/inc/AccessibleShapeInfo.hxx 2003-04-24 11:50:00.000000000 -0500 +++ OOo-build/svx/inc/AccessibleShapeInfo.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -139,10 +139,10 @@ ~AccessibleShapeInfo (void); + AccessibleShapeInfo (const AccessibleShapeInfo&); private: // Don't use these three methods. explicit AccessibleShapeInfo (void); - explicit AccessibleShapeInfo (const AccessibleShapeInfo&); AccessibleShapeInfo& operator= (const AccessibleShapeInfo&); }; diff -Naur OOo-build-orig/svx/inc/ShapeTypeHandler.hxx OOo-build/svx/inc/ShapeTypeHandler.hxx --- OOo-build-orig/svx/inc/ShapeTypeHandler.hxx 2003-04-24 11:50:54.000000000 -0500 +++ OOo-build/svx/inc/ShapeTypeHandler.hxx 2005-04-27 00:00:00.000000000 -0500 @@ -205,7 +205,8 @@ ::com::sun::star::accessibility::XAccessible>& rxParent, const AccessibleShapeTreeInfo& rShapeTreeInfo) const { - return CreateAccessibleObject (AccessibleShapeInfo (rxShape,rxParent),rShapeTreeInfo); + AccessibleShapeInfo aShapeInfo(rxShape, rxParent); + return CreateAccessibleObject (aShapeInfo, rShapeTreeInfo); } /** Add new shape types to the internal tables. Each new shape type is diff -Naur OOo-build-orig/svx/inc/frmsel.hxx OOo-build/svx/inc/frmsel.hxx --- OOo-build-orig/svx/inc/frmsel.hxx 2003-04-24 11:51:37.000000000 -0500 +++ OOo-build/svx/inc/frmsel.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -172,8 +172,8 @@ class SvxFrameSelector : public Control { - friend SvxFrameSelectorAccessible_Impl; - friend SvxFrameSelector_Impl; + friend class SvxFrameSelectorAccessible_Impl; + friend class SvxFrameSelector_Impl; SvxFrameShadow eShadow; // Schattenposition Color aShadowCol; // aktuelle Schattenfarbe diff -Naur OOo-build-orig/svx/inc/srchdlg.hxx OOo-build/svx/inc/srchdlg.hxx --- OOo-build-orig/svx/inc/srchdlg.hxx 2002-06-24 03:21:50.000000000 -0500 +++ OOo-build/svx/inc/srchdlg.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -297,7 +297,7 @@ SvxSearchController* pSearchSetController; SvxSearchController* pReplaceSetController; - INT32 nTransliterationFlags; + mutable INT32 nTransliterationFlags; #ifdef _SVX_SRCHDLG_CXX DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit ); diff -Naur OOo-build-orig/svx/inc/svdetc.hxx OOo-build/svx/inc/svdetc.hxx --- OOo-build-orig/svx/inc/svdetc.hxx 2001-11-23 13:20:49.000000000 -0600 +++ OOo-build/svx/inc/svdetc.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -194,26 +194,17 @@ #endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} -#if SUPD>358 void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; -#else - void DoSort(); - void DoSort(ULONG a, ULONG b=0xFFFFFFFF) const; -#endif #ifdef This_Is_Just_For_A_Comment Compare() muss returnieren: -1 falls *pElem1<*pElem2 0 falls *pElem1=*pElem2 +1 falls *pElem1>*pElem2 #endif - virtual int Compare(const void* pElem1, const void* pElem2) const=NULL; + virtual int Compare(const void* pElem1, const void* pElem2) const=0; private: // damit keiner vergessen wird virtual -#if SUPD <= 355 - FASTBOOL -#else void -#endif Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; // virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; }; diff -Naur OOo-build-orig/svx/inc/unomaster.hxx OOo-build/svx/inc/unomaster.hxx --- OOo-build-orig/svx/inc/unomaster.hxx 2001-12-07 11:59:33.000000000 -0600 +++ OOo-build/svx/inc/unomaster.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -84,7 +84,7 @@ class SvxShapeMaster { public: - virtual sal_Bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = NULL; + virtual sal_Bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; @@ -98,7 +98,7 @@ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; - virtual void dispose() = NULL; + virtual void dispose() = 0; }; #endif diff -Naur OOo-build-orig/svx/source/accessibility/AccessibleShapeInfo.cxx OOo-build/svx/source/accessibility/AccessibleShapeInfo.cxx --- OOo-build-orig/svx/source/accessibility/AccessibleShapeInfo.cxx 2003-04-24 11:55:01.000000000 -0500 +++ OOo-build/svx/source/accessibility/AccessibleShapeInfo.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -99,7 +99,14 @@ // empty. } - +AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther) + : mxShape (rOther.mxShape), + mxParent (rOther.mxParent), + mpChildrenManager (rOther.mpChildrenManager), + mnIndex (rOther.mnIndex) +{ + // empty. +} AccessibleShapeInfo::~AccessibleShapeInfo (void) diff -Naur OOo-build-orig/svx/source/accessibility/AccessibleTextEventQueue.hxx OOo-build/svx/source/accessibility/AccessibleTextEventQueue.hxx --- OOo-build-orig/svx/source/accessibility/AccessibleTextEventQueue.hxx 2003-06-24 02:39:24.000000000 -0500 +++ OOo-build/svx/source/accessibility/AccessibleTextEventQueue.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -64,6 +64,7 @@ #include #include +#include #ifndef _SOLAR_H #include diff -Naur OOo-build-orig/svx/source/accessibility/ChildrenManagerImpl.cxx OOo-build/svx/source/accessibility/ChildrenManagerImpl.cxx --- OOo-build-orig/svx/source/accessibility/ChildrenManagerImpl.cxx 2003-04-28 10:27:00.000000000 -0500 +++ OOo-build/svx/source/accessibility/ChildrenManagerImpl.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -195,15 +195,16 @@ // created while locking the global mutex. if ( ! rChildDescriptor.mxAccessibleShape.is()) { + AccessibleShapeInfo aShapeInfo( + rChildDescriptor.mxShape, + mxParent, + this, + mnNewNameIndex++); // Create accessible object that corresponds to the descriptor's // shape. AccessibleShape* pShape = ShapeTypeHandler::Instance().CreateAccessibleObject ( - AccessibleShapeInfo ( - rChildDescriptor.mxShape, - mxParent, - this, - mnNewNameIndex++), + aShapeInfo, maShapeTreeInfo); rChildDescriptor.mxAccessibleShape = uno::Reference ( static_cast(pShape), @@ -796,9 +797,10 @@ const AccessibleShapeTreeInfo& _rShapeTreeInfo) throw (uno::RuntimeException) { + AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ); // create the new child AccessibleShape* pNewChild = ShapeTypeHandler::Instance().CreateAccessibleObject ( - AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ), + aShapeInfo, _rShapeTreeInfo ); Reference< XAccessible > xNewChild( pNewChild ); // keep this alive (do this before calling Init!) diff -Naur OOo-build-orig/svx/source/accessibility/GraphCtlAccessibleContext.cxx OOo-build/svx/source/accessibility/GraphCtlAccessibleContext.cxx --- OOo-build-orig/svx/source/accessibility/GraphCtlAccessibleContext.cxx 2003-06-26 06:10:07.000000000 -0500 +++ OOo-build/svx/source/accessibility/GraphCtlAccessibleContext.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -251,9 +251,10 @@ // create a new one and remember in our internal map Reference< XShape > xShape( Reference< XShape >::query( (const_cast(pObj))->getUnoShape() ) ); + AccessibleShapeInfo aShapeInfo (xShape,mxParent); // Create accessible object that corresponds to the descriptor's shape. AccessibleShape* pAcc = ShapeTypeHandler::Instance().CreateAccessibleObject( - AccessibleShapeInfo (xShape,mxParent), maTreeInfo); + aShapeInfo, maTreeInfo); xAccessibleShape = pAcc; if (pAcc != NULL) { diff -Naur OOo-build-orig/svx/source/dialog/srchdlg.cxx OOo-build/svx/source/dialog/srchdlg.cxx --- OOo-build-orig/svx/source/dialog/srchdlg.cxx 2003-04-08 10:24:47.000000000 -0500 +++ OOo-build/svx/source/dialog/srchdlg.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -582,15 +582,14 @@ INT32 SvxSearchDialog::GetTransliterationFlags() const { - INT32 &rFlags = (INT32) nTransliterationFlags; if (!aMatchCaseCB.IsChecked()) - rFlags |= TransliterationModules_IGNORE_CASE; + nTransliterationFlags |= TransliterationModules_IGNORE_CASE; else - rFlags &= ~TransliterationModules_IGNORE_CASE; + nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE; if ( !aJapMatchFullHalfWidthCB.IsChecked()) - rFlags |= TransliterationModules_IGNORE_WIDTH; + nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH; else - rFlags &= ~TransliterationModules_IGNORE_WIDTH; + nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH; return nTransliterationFlags; } diff -Naur OOo-build-orig/svx/source/fmcomp/gridcell.cxx OOo-build/svx/source/fmcomp/gridcell.cxx --- OOo-build-orig/svx/source/fmcomp/gridcell.cxx 2003-04-15 12:30:38.000000000 -0500 +++ OOo-build/svx/source/fmcomp/gridcell.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -3040,9 +3040,6 @@ /*************************************************************************/ -SMART_UNO_IMPLEMENTATION(FmXEditCell, FmXTextCell); - - DBG_NAME(FmXEditCell); //------------------------------------------------------------------------------ FmXEditCell::FmXEditCell(DbGridColumn* pColumn, DbCellControl* pControl) @@ -3248,9 +3245,6 @@ } /*************************************************************************/ -SMART_UNO_IMPLEMENTATION(FmXCheckBoxCell, FmXDataCell); - - DBG_NAME(FmXCheckBoxCell); //------------------------------------------------------------------------------ FmXCheckBoxCell::FmXCheckBoxCell(DbGridColumn* pColumn, DbCellControl* pControl) @@ -3394,9 +3388,6 @@ } /*************************************************************************/ -SMART_UNO_IMPLEMENTATION(FmXListBoxCell, FmXTextCell); - - DBG_NAME(FmXListBoxCell); //------------------------------------------------------------------------------ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl* pControl) diff -Naur OOo-build-orig/svx/source/inc/hlmarkwn.hxx OOo-build/svx/source/inc/hlmarkwn.hxx --- OOo-build-orig/svx/source/inc/hlmarkwn.hxx 2001-05-08 10:21:39.000000000 -0500 +++ OOo-build/svx/source/inc/hlmarkwn.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -114,7 +114,7 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow { private: - friend SvxHlmarkTreeLBox; + friend class SvxHlmarkTreeLBox; PushButton maBtApply; PushButton maBtClose; diff -Naur OOo-build-orig/sw/source/core/bastyp/calc.cxx OOo-build/sw/source/core/bastyp/calc.cxx --- OOo-build-orig/sw/source/core/bastyp/calc.cxx 2004-01-09 08:31:20.000000000 -0600 +++ OOo-build/sw/source/core/bastyp/calc.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1745,7 +1745,7 @@ { for ( USHORT i = 0; i < nCount; ++i ) delete *(ppHashTable+i); - __DELETE(nCount) ppHashTable; + delete [] ppHashTable; } SwCalcExp::SwCalcExp( const String& rStr, const SwSbxValue& rVal, diff -Naur OOo-build-orig/sw/source/core/doc/doclay.cxx OOo-build/sw/source/core/doc/doclay.cxx --- OOo-build-orig/sw/source/core/doc/doclay.cxx 2003-07-04 08:19:41.000000000 -0500 +++ OOo-build/sw/source/core/doc/doclay.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1883,7 +1883,7 @@ break; } - __DELETE( nFlagSize ) pSetFlags; + delete [] pSetFlags; return aName += String::CreateFromInt32( ++nNum ); } diff -Naur OOo-build-orig/sw/source/core/doc/docnum.cxx OOo-build/sw/source/core/doc/docnum.cxx --- OOo-build-orig/sw/source/core/doc/docnum.cxx 2004-10-12 04:40:35.000000000 -0500 +++ OOo-build/sw/source/core/doc/docnum.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1942,7 +1942,8 @@ if( !pOwnRedl && !IsIgnoreRedline() && GetRedlineTbl().Count() ) { - SplitRedline( SwPaM( aIdx )); + SwPaM aTemp(aIdx); + SplitRedline(aTemp); } ULONG nRedlSttNd, nRedlEndNd; @@ -2183,7 +2184,7 @@ } } - __DELETE( nFlagSize ) pSetFlags; + delete [] pSetFlags; if( pChkStr && pChkStr->Len() ) return *pChkStr; return aName += String::CreateFromInt32( ++nNum ); diff -Naur OOo-build-orig/sw/source/core/doc/docredln.cxx OOo-build/sw/source/core/doc/docredln.cxx --- OOo-build-orig/sw/source/core/doc/docredln.cxx 2004-01-09 08:31:25.000000000 -0600 +++ OOo-build/sw/source/core/doc/docredln.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1315,8 +1315,8 @@ BOOL SwDoc::DeleteRedline( const SwStartNode& rNode, BOOL bSaveInUndo, USHORT nDelType ) { - return DeleteRedline( SwPaM( *rNode.EndOfSectionNode(), rNode ), - bSaveInUndo, nDelType ); + SwPaM aTemp(*rNode.EndOfSectionNode(), rNode); + return DeleteRedline(aTemp, bSaveInUndo, nDelType); } void SwDoc::DeleteRedline( USHORT nPos ) diff -Naur OOo-build-orig/sw/source/core/doc/docsort.cxx OOo-build/sw/source/core/doc/docsort.cxx --- OOo-build-orig/sw/source/core/doc/docsort.cxx 2003-04-17 08:51:40.000000000 -0500 +++ OOo-build/sw/source/core/doc/docsort.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -887,10 +887,10 @@ FlatFndBox::~FlatFndBox() { _FndBox** ppTmp = (_FndBox**)pArr; - __DELETE(nRows * nCols * sizeof(_FndBoxPtr)) ppTmp; + delete [] ppTmp; if( ppItemSets ) - __DELETE(nRows * nCols * sizeof(SfxItemSet*)) ppItemSets; + delete [] ppItemSets; } /*-------------------------------------------------------------------- diff -Naur OOo-build-orig/sw/source/core/doc/doctxm.cxx OOo-build/sw/source/core/doc/doctxm.cxx --- OOo-build-orig/sw/source/core/doc/doctxm.cxx 2004-01-09 08:31:26.000000000 -0600 +++ OOo-build/sw/source/core/doc/doctxm.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -848,7 +848,7 @@ break; } } - __DELETE( nFlagSize ) pSetFlags; + delete [] pSetFlags; if( pChkStr ) return *pChkStr; return aName += String::CreateFromInt32( ++nNum ); diff -Naur OOo-build-orig/sw/source/core/doc/swtable.cxx OOo-build/sw/source/core/doc/swtable.cxx --- OOo-build-orig/sw/source/core/doc/swtable.cxx 2003-04-17 11:05:04.000000000 -0500 +++ OOo-build/sw/source/core/doc/swtable.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1691,18 +1691,18 @@ if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) { - pDoc->DeleteRedline( SwPaM( *pTNd, 0, *pTNd, rOrig.Len() ), - sal_True ); + SwPaM aTemp(*pTNd, 0, *pTNd, rOrig.Len()); + pDoc->DeleteRedline(aTemp, sal_True); } pTNd->Erase( aIdx, n, INS_EMPTYEXPAND ); pTNd->Insert( rTxt, aIdx, INS_EMPTYEXPAND ); if( pDoc->IsRedlineOn() ) - { - pDoc->AppendRedline( - new SwRedline( REDLINE_INSERT, - SwPaM( *pTNd, 0, *pTNd, rTxt.Len() ) ) ); + { + SwPaM aTemp(*pTNd, 0, *pTNd, rTxt.Len()); + pDoc->AppendRedline(new SwRedline(REDLINE_INSERT, aTemp)); + } } diff -Naur OOo-build-orig/sw/source/core/docnode/ndsect.cxx OOo-build/sw/source/core/docnode/ndsect.cxx --- OOo-build-orig/sw/source/core/docnode/ndsect.cxx 2004-01-09 08:31:28.000000000 -0600 +++ OOo-build/sw/source/core/docnode/ndsect.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1454,7 +1454,7 @@ } } - __DELETE( nFlagSize ) pSetFlags; + delete [] pSetFlags; if( pChkStr ) return *pChkStr; return aName += String::CreateFromInt32( ++nNum ); diff -Naur OOo-build-orig/sw/source/core/docnode/ndtbl.cxx OOo-build/sw/source/core/docnode/ndtbl.cxx --- OOo-build-orig/sw/source/core/docnode/ndtbl.cxx 2004-10-12 04:35:13.000000000 -0500 +++ OOo-build/sw/source/core/docnode/ndtbl.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -3321,7 +3321,7 @@ break; } - __DELETE( nFlagSize ) pSetFlags; + delete [] pSetFlags; return aName += String::CreateFromInt32( ++nNum ); } diff -Naur OOo-build-orig/sw/source/core/frmedt/fecopy.cxx OOo-build/sw/source/core/frmedt/fecopy.cxx --- OOo-build-orig/sw/source/core/frmedt/fecopy.cxx 2003-07-11 07:23:07.000000000 -0500 +++ OOo-build/sw/source/core/frmedt/fecopy.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -391,8 +391,9 @@ SdrObject* pNew = pClpDoc->CloneSdrObj( *pObj, FALSE, TRUE ); //JP 07.01.00: why move?? -// pNew->NbcMove( aSiz ); - pClpDoc->Insert( SwPaM( aPos ), *pNew, &aSet ); +// pNew->NbcMove(aSiz); + SwPaM aTemp(aPos); + pClpDoc->Insert(aTemp, *pNew, &aSet); } else { diff -Naur OOo-build-orig/sw/source/core/txtnode/thints.cxx OOo-build/sw/source/core/txtnode/thints.cxx --- OOo-build-orig/sw/source/core/txtnode/thints.cxx 2003-07-04 08:25:08.000000000 -0500 +++ OOo-build/sw/source/core/txtnode/thints.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -1075,7 +1075,7 @@ // uneindeutig rSet.InvalidateItem( nWh ); } - __DELETE( coArrSz ) aAttrArr; + delete [] aAttrArr; } } if( aFmtSet.Count() ) diff -Naur OOo-build-orig/sw/source/core/undo/rolbck.cxx OOo-build/sw/source/core/undo/rolbck.cxx --- OOo-build-orig/sw/source/core/undo/rolbck.cxx 2004-01-09 08:31:49.000000000 -0600 +++ OOo-build/sw/source/core/undo/rolbck.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -516,7 +516,8 @@ if ( pUndo ) { // setze die Fussnote im TextNode - SwFmtFtn& rNew = (SwFmtFtn&)pDoc->GetAttrPool().Put( SwFmtFtn( bEndNote ) ); + SwFmtFtn aTemp( bEndNote ); + SwFmtFtn& rNew = (SwFmtFtn&)pDoc->GetAttrPool().Put(aTemp); if( aFtnStr.Len() ) rNew.SetNumStr( aFtnStr ); SwTxtFtn* pTxtFtn = new SwTxtFtn( rNew, nStart ); diff -Naur OOo-build-orig/sw/source/core/undo/undraw.cxx OOo-build/sw/source/core/undo/undraw.cxx --- OOo-build-orig/sw/source/core/undo/undraw.cxx 2003-04-17 09:38:40.000000000 -0500 +++ OOo-build/sw/source/core/undo/undraw.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -308,7 +308,7 @@ else delete pObjArr->pFmt; // das GroupObject-Format - __DELETE ( nSize ) pObjArr; + delete [] pObjArr; } void SwUndoDrawGroup::Undo( SwUndoIter& ) @@ -471,7 +471,7 @@ else delete pObjArr->pFmt; // das GroupObject-Format - __DELETE ( nSize ) pObjArr; + delete [] pObjArr; } void SwUndoDrawUnGroup::Undo( SwUndoIter& rIter ) @@ -584,7 +584,7 @@ for( USHORT n = 0; n < pMarkLst->GetMarkCount(); ++n, ++pTmp ) delete pTmp->pFmt; } - __DELETE ( nSize ) pObjArr; + delete [] pObjArr; delete pMarkLst; } diff -Naur OOo-build-orig/sw/source/filter/ww1/w1class.hxx OOo-build/sw/source/filter/ww1/w1class.hxx --- OOo-build-orig/sw/source/filter/ww1/w1class.hxx 2001-09-28 03:07:48.000000000 -0500 +++ OOo-build/sw/source/filter/ww1/w1class.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -352,7 +352,7 @@ return 256; } friend ostream& operator <<(ostream&, Ww1StyleSheet&); void Out(Ww1Shell&, Ww1Manager&); - friend Ww1Style; + friend class Ww1Style; BOOL GetError() { return !bOK; } }; diff -Naur OOo-build-orig/sw/source/filter/ww8/wrtww8.hxx OOo-build/sw/source/filter/ww8/wrtww8.hxx --- OOo-build-orig/sw/source/filter/ww8/wrtww8.hxx 2004-03-18 06:17:59.000000000 -0600 +++ OOo-build/sw/source/filter/ww8/wrtww8.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -406,7 +406,7 @@ class SwWW8Writer: public StgWriter { friend bool WW8_WrPlcSepx::WriteKFTxt( SwWW8Writer& rWrt ); // pO -friend void WW8_WrPlcSepx::WriteOlst( SwWW8Writer& rWrt, USHORT i ); +friend class WW8_WrPlcSepx; friend Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ); wwFontHelper maFontHelper; diff -Naur OOo-build-orig/sw/source/ui/inc/cfgitems.hxx OOo-build/sw/source/ui/inc/cfgitems.hxx --- OOo-build-orig/sw/source/ui/inc/cfgitems.hxx 2002-09-20 07:09:59.000000000 -0500 +++ OOo-build/sw/source/ui/inc/cfgitems.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -94,9 +94,9 @@ --------------------------------------------------------- */ class SwDocDisplayItem : public SfxPoolItem { - friend SwWriterApp; - friend SwShdwCrsrOptionsTabPage; - friend SwModule; + friend class SwWriterApp; + friend class SwShdwCrsrOptionsTabPage; + friend class SwModule; BOOL bParagraphEnd :1; BOOL bTab :1; @@ -148,7 +148,7 @@ BOOL bFieldName :1; BOOL bNotes :1; - friend SwContentOptPage; + friend class SwContentOptPage; public: TYPEINFO(); @@ -170,7 +170,7 @@ class SwAddPrinterItem : public SfxPoolItem, public SwPrintData { - friend SwAddPrinterTabPage; + friend class SwAddPrinterTabPage; public: TYPEINFO(); diff -Naur OOo-build-orig/sw/source/ui/inc/glossary.hxx OOo-build/sw/source/ui/inc/glossary.hxx --- OOo-build-orig/sw/source/ui/inc/glossary.hxx 2001-06-27 04:45:14.000000000 -0500 +++ OOo-build/sw/source/ui/inc/glossary.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -163,8 +163,8 @@ class SwOneExampleFrame; class SwGlossaryDlg : public SvxStandardDialog { - friend SwNewGlosNameDlg; - friend SwGlTreeListBox; + friend class SwNewGlosNameDlg; + friend class SwGlTreeListBox; CheckBox aInsertTipCB; FixedText aNameLbl; diff -Naur OOo-build-orig/sw/source/ui/wizard/wizag.hxx OOo-build/sw/source/ui/wizard/wizag.hxx --- OOo-build-orig/sw/source/ui/wizard/wizag.hxx 2002-03-12 06:47:37.000000000 -0600 +++ OOo-build/sw/source/ui/wizard/wizag.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -122,7 +122,7 @@ #define DIALOGLINES 6 class AgenList { -friend AgenDialog; +friend class AgenDialog; AgendaDlgRec aRec[DIALOGLINES]; AgenDialog* pDlg; ScrollBar* pScrl; @@ -158,7 +158,7 @@ class AgenDialog: public WizardAgenDialog, private WizardGo { -friend AgenList; +friend class AgenList; WizardAgenPage aPage1; SwAgendaWizardCfg aConfig; AgenList aList; diff -Naur OOo-build-orig/sw/source/ui/wizard/wizmulti.cxx OOo-build/sw/source/ui/wizard/wizmulti.cxx --- OOo-build-orig/sw/source/ui/wizard/wizmulti.cxx 2003-04-17 11:03:54.000000000 -0500 +++ OOo-build/sw/source/ui/wizard/wizmulti.cxx 2005-04-27 00:00:01.000000000 -0500 @@ -176,7 +176,7 @@ MultiDialog::~MultiDialog() { if( WinList ) - __DELETE( StepAnz ) WinList; + delete [] WinList; } void MultiDialog::Init(Button* pPrev, Button* pNext) diff -Naur OOo-build-orig/sw/source/ui/wizard/wizpage.hxx OOo-build/sw/source/ui/wizard/wizpage.hxx --- OOo-build-orig/sw/source/ui/wizard/wizpage.hxx 2002-08-14 08:24:38.000000000 -0500 +++ OOo-build/sw/source/ui/wizard/wizpage.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -121,7 +121,7 @@ class WizardFrame { -friend WizardIni; +friend class WizardIni; BOOL b2ndHide; BOOL bIsDa; protected: diff -Naur OOo-build-orig/testshl2/inc/cppunit/autoregister/callbackstructure.h OOo-build/testshl2/inc/cppunit/autoregister/callbackstructure.h --- OOo-build-orig/testshl2/inc/cppunit/autoregister/callbackstructure.h 2003-01-09 05:46:09.000000000 -0600 +++ OOo-build/testshl2/inc/cppunit/autoregister/callbackstructure.h 2005-04-27 00:00:01.000000000 -0500 @@ -99,7 +99,7 @@ CallbackStructure() :nVersion(1), - nMagic(0x0123456789abcdef), + nMagic(SAL_CONST_INT64(0x0123456789abcdef)), aRegisterFunction(NULL), aCallbackDispatch(NULL), /* aStartTest(NULL), diff -Naur OOo-build-orig/testshl2/source/result/TestResult.cpp OOo-build/testshl2/source/result/TestResult.cpp --- OOo-build-orig/testshl2/source/result/TestResult.cpp 2003-05-19 08:14:57.000000000 -0500 +++ OOo-build/testshl2/source/result/TestResult.cpp 2005-04-27 00:00:01.000000000 -0500 @@ -42,7 +42,8 @@ TestResult::addError( Test *test, Exception *e, ErrorType::num _eType ) { - addFailure( TestFailure( test, e, _eType ) ); + TestFailure aTestFailure( test, e, _eType ); + addFailure( aTestFailure ); } @@ -52,7 +53,8 @@ void TestResult::addFailure( Test *test, Exception *e ) { - addFailure( TestFailure( test, e, ErrorType::FAILURE ) ); + TestFailure aTestFailure( test, e, ErrorType::FAILURE ); + addFailure( aTestFailure ); } diff -Naur OOo-build-orig/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx OOo-build/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx --- OOo-build-orig/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx 2001-09-05 01:40:48.000000000 -0500 +++ OOo-build/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx 2005-04-27 00:00:01.000000000 -0500 @@ -82,7 +82,7 @@ template ::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel::getInfoHelper() { - return *getArrayHelper(); + return *this->getArrayHelper(); } //-------------------------------------------------------------------- @@ -125,6 +125,9 @@ /************************************************************************* * history: * $Log: geometrycontrolmodel_impl.hxx,v $ + * Revision 1.3.268.1 2004/07/13 16:56:04 hr + * #i31439#: fix template resolution + * * Revision 1.3 2001/09/05 06:40:48 fs * #88891# override the XTypeProvider methods * diff -Naur OOo-build-orig/ucb/source/cacher/cachedcontentresultset.cxx OOo-build/ucb/source/cacher/cachedcontentresultset.cxx --- OOo-build-orig/ucb/source/cacher/cachedcontentresultset.cxx 2001-12-05 07:03:43.000000000 -0600 +++ OOo-build/ucb/source/cacher/cachedcontentresultset.cxx 2005-04-27 00:00:02.000000000 -0500 @@ -444,7 +444,7 @@ public com::sun::star::lang::XTypeProvider, public com::sun::star::beans::XPropertySetInfo { -friend CachedContentResultSet; +friend class CachedContentResultSet; //my Properties Sequence< com::sun::star::beans::Property >* m_pProperties; diff -Naur OOo-build-orig/ucb/source/inc/regexpmap.hxx OOo-build/ucb/source/inc/regexpmap.hxx --- OOo-build-orig/ucb/source/inc/regexpmap.hxx 2000-10-16 09:53:07.000000000 -0500 +++ OOo-build/ucb/source/inc/regexpmap.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -102,8 +102,8 @@ template< typename Val > class RegexpMapConstIter { - friend RegexpMap< Val >; // to access m_pImpl, ctor - friend RegexpMapIter< Val >; // to access m_pImpl, ctor + friend class RegexpMap< Val >; // to access m_pImpl, ctor + friend class RegexpMapIter< Val >; // to access m_pImpl, ctor public: RegexpMapConstIter(); @@ -135,7 +135,7 @@ template< typename Val > class RegexpMapIter: public RegexpMapConstIter< Val > { - friend RegexpMap< Val >; // to access ctor + friend class RegexpMap< Val >; // to access ctor public: RegexpMapIter() {} diff -Naur OOo-build-orig/ucb/source/inc/regexpmap.tpt OOo-build/ucb/source/inc/regexpmap.tpt --- OOo-build-orig/ucb/source/inc/regexpmap.tpt 2000-10-16 09:53:07.000000000 -0500 +++ OOo-build/ucb/source/inc/regexpmap.tpt 2005-04-27 00:00:02.000000000 -0500 @@ -112,7 +112,7 @@ { public: typedef RegexpMapImpl< Val > MapImpl; - typedef List< Val >::iterator ListIterator; + typedef typename List< Val >::iterator ListIterator; // Solaris needs these for the ctor... inline RegexpMapIterImpl(); @@ -128,7 +128,7 @@ int getList() const { return m_nList; } - List< Val >::iterator const & getIndex() const { return m_aIndex; } + typename List< Val >::iterator const & getIndex() const { return m_aIndex; } void next(); @@ -136,7 +136,7 @@ private: mutable RegexpMapEntry< Val > m_aEntry; - List< Val >::iterator m_aIndex; + typename List< Val >::iterator m_aIndex; RegexpMapImpl< Val > * m_pMap; int m_nList; mutable bool m_bEntrySet; @@ -191,7 +191,7 @@ if (bBegin) { m_nList = -1; - m_aIndex = List< Val >::iterator(); + m_aIndex = typename List< Val >::iterator(); if (!m_pMap->m_pDefault) next(); } @@ -342,7 +342,7 @@ template< typename Val > RegexpMapIter< Val > & RegexpMapIter< Val >::operator ++() { - m_pImpl->next(); + RegexpMapIter< Val >::m_pImpl->next(); return *this; } @@ -351,7 +351,7 @@ RegexpMapIter< Val > RegexpMapIter< Val >::operator ++(int) { RegexpMapIter aTemp(*this); - m_pImpl->next(); + RegexpMapIter< Val >::m_pImpl->next(); return aTemp; } @@ -359,28 +359,28 @@ template< typename Val > RegexpMapEntry< Val > & RegexpMapIter< Val >::operator *() { - return m_pImpl->get(); + return RegexpMapIter< Val >::m_pImpl->get(); } //============================================================================ template< typename Val > RegexpMapEntry< Val > const & RegexpMapIter< Val >::operator *() const { - return m_pImpl->get(); + return RegexpMapIter< Val >::m_pImpl->get(); } //============================================================================ template< typename Val > RegexpMapEntry< Val > * RegexpMapIter< Val >::operator ->() { - return &m_pImpl->get(); + return &RegexpMapIter< Val >::m_pImpl->get(); } //============================================================================ template< typename Val > RegexpMapEntry< Val > const * RegexpMapIter< Val >::operator ->() const { - return &m_pImpl->get(); + return &RegexpMapIter< Val >::m_pImpl->get(); } //============================================================================ @@ -452,8 +452,8 @@ { List< Val > & rTheList = m_pImpl->m_aList[aRegexp.getKind()]; - List< Val >::iterator aEnd(rTheList.end()); - for (List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) + typename List< Val >::iterator aEnd(rTheList.end()); + for (typename List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) if (aIt->m_aRegexp == aRegexp) if (bOverwrite) { @@ -474,7 +474,7 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey, +typename RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey, rtl::OUString * pReverse) { Regexp aRegexp(Regexp::parse(rKey)); @@ -492,8 +492,8 @@ { List< Val > & rTheList = m_pImpl->m_aList[aRegexp.getKind()]; - List< Val > ::iterator aEnd(rTheList.end()); - for (List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) + typename List< Val > ::iterator aEnd(rTheList.end()); + for (typename List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) if (aIt->m_aRegexp == aRegexp) return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >( m_pImpl, @@ -523,14 +523,14 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::begin() +typename RegexpMap< Val >::iterator RegexpMap< Val >::begin() { return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true)); } //============================================================================ template< typename Val > -RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const +typename RegexpMap< Val >::const_iterator RegexpMap< Val >::begin() const { return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, true)); @@ -538,14 +538,14 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::iterator RegexpMap< Val >::end() +typename RegexpMap< Val >::iterator RegexpMap< Val >::end() { return RegexpMapIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false)); } //============================================================================ template< typename Val > -RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const +typename RegexpMap< Val >::const_iterator RegexpMap< Val >::end() const { return RegexpMapConstIter< Val >(new RegexpMapIterImpl< Val >(m_pImpl, false)); @@ -563,7 +563,7 @@ //============================================================================ template< typename Val > -RegexpMap< Val >::size_type RegexpMap< Val >::size() const +typename RegexpMap< Val >::size_type RegexpMap< Val >::size() const { return (m_pImpl->m_pDefault ? 1 : 0) + m_pImpl->m_aList[Regexp::KIND_PREFIX].size() @@ -581,8 +581,8 @@ { List< Val > const & rTheList = m_pImpl->m_aList[n]; - List< Val >::const_iterator aEnd(rTheList.end()); - for (List< Val >::const_iterator aIt(rTheList.begin()); aIt != aEnd; + typename List< Val >::const_iterator aEnd(rTheList.end()); + for (typename List< Val >::const_iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) if (aIt->m_aRegexp.matches(rString, pTranslation, pTranslated)) return &aIt->m_aValue; diff -Naur OOo-build-orig/ucbhelper/inc/ucbhelper/remotecontentproviderscontrol.hxx OOo-build/ucbhelper/inc/ucbhelper/remotecontentproviderscontrol.hxx --- OOo-build-orig/ucbhelper/inc/ucbhelper/remotecontentproviderscontrol.hxx 2001-06-20 02:48:19.000000000 -0500 +++ OOo-build/ucbhelper/inc/ucbhelper/remotecontentproviderscontrol.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -163,7 +163,7 @@ void closed(Listeners::iterator aIt, bool bDistribution); - friend Listener; // to access Listeners, setClosed() + friend class Listener; // to access Listeners, setClosed() }; } diff -Naur OOo-build-orig/vcl/inc/glyphcache.hxx OOo-build/vcl/inc/glyphcache.hxx --- OOo-build-orig/vcl/inc/glyphcache.hxx 2004-08-25 04:35:11.000000000 -0500 +++ OOo-build/vcl/inc/glyphcache.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -124,7 +124,7 @@ void RemoveFont( const ImplFontData* ); private: -friend ServerFont; +friend class ServerFont; // used by ServerFont class only void AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData ); void RemovingGlyph( ServerFont& rSF, GlyphData& rGD, int nGlyphIndex ); @@ -244,8 +244,8 @@ void* GetExtPointer() { return mpExtData; } protected: -friend GlyphCache; -friend ServerFontLayout; +friend class GlyphCache; +friend class ServerFontLayout; ServerFont( const ImplFontSelectData&, const glyphKernMap* pGlyphKern = NULL, const unicodeKernMap* pUniKern = NULL ); virtual ~ServerFont(); diff -Naur OOo-build-orig/vcl/source/glyphs/gcach_ftyp.hxx OOo-build/vcl/source/glyphs/gcach_ftyp.hxx --- OOo-build-orig/vcl/source/glyphs/gcach_ftyp.hxx 2004-08-25 04:35:49.000000000 -0500 +++ OOo-build/vcl/source/glyphs/gcach_ftyp.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -213,7 +213,7 @@ int GetEmUnits() const; protected: -friend GlyphCache; +friend class GlyphCache; int ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_* ) const; virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const; diff -Naur OOo-build-orig/vcl/source/glyphs/gcach_vdev.hxx OOo-build/vcl/source/glyphs/gcach_vdev.hxx --- OOo-build-orig/vcl/source/glyphs/gcach_vdev.hxx 2002-02-15 09:58:57.000000000 -0600 +++ OOo-build/vcl/source/glyphs/gcach_vdev.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -72,7 +72,7 @@ virtual bool GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const; protected: -friend GlyphCache; +friend class GlyphCache; static long FetchFontList( ImplDevFontList* ); static void ClearFontList(); diff -Naur OOo-build-orig/vcl/unx/source/gdi/xlfd_extd.hxx OOo-build/vcl/unx/source/gdi/xlfd_extd.hxx --- OOo-build-orig/vcl/unx/source/gdi/xlfd_extd.hxx 2004-01-26 11:27:37.000000000 -0600 +++ OOo-build/vcl/unx/source/gdi/xlfd_extd.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -93,8 +93,8 @@ class ExtendedXlfd { - friend VirtualXlfd; - friend XlfdStorage; + friend class VirtualXlfd; + friend class XlfdStorage; public: ExtendedXlfd(); diff -Naur OOo-build-orig/xml2cmp/source/support/list.hxx OOo-build/xml2cmp/source/support/list.hxx --- OOo-build-orig/xml2cmp/source/support/list.hxx 2002-08-08 11:07:56.000000000 -0500 +++ OOo-build/xml2cmp/source/support/list.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -252,31 +252,31 @@ template DynamicList::~DynamicList() { - erase_all(); + DynamicList::erase_all(); } template void DynamicList::insert(unsigned pos, XY * const & elem) { - if ( pos > len ) + if ( pos > DynamicList::len ) return; - checkSize(len+2); - memmove(inhalt[pos+1], inhalt[pos], (len-pos) * sizeof(XY*) ); - inhalt[pos] = elem; - len++; + checkSize(DynamicList::len+2); + memmove(DynamicList::inhalt[pos+1], DynamicList::inhalt[pos], (DynamicList::len-pos) * sizeof(XY*) ); + DynamicList::inhalt[pos] = elem; + DynamicList::len++; } template void DynamicList::remove( unsigned pos ) { - if (!is_valid_index(pos) ) + if (!DynamicList::is_valid_index(pos) ) return; - len--; - delete inhalt[pos]; - memmove(inhalt[pos], inhalt[pos+1], (len-pos) * sizeof(XY*) ); + DynamicList::len--; + delete DynamicList::inhalt[pos]; + memmove(DynamicList::inhalt[pos], DynamicList::inhalt[pos+1], (DynamicList::len-pos) * sizeof(XY*) ); } diff -Naur OOo-build-orig/xmloff/source/forms/elementimport_impl.hxx OOo-build/xmloff/source/forms/elementimport_impl.hxx --- OOo-build-orig/xmloff/source/forms/elementimport_impl.hxx 2001-01-03 10:25:34.000000000 -0600 +++ OOo-build/xmloff/source/forms/elementimport_impl.hxx 2005-04-27 00:00:02.000000000 -0500 @@ -148,7 +148,7 @@ if (m_xColumnFactory.is()) { // create the column - xReturn = m_xColumnFactory->createColumn(m_sServiceName); + xReturn = m_xColumnFactory->createColumn(this->m_sServiceName); OSL_ENSURE(xReturn.is(), "OColumnImport::createElement: the factory returned an invalid object!"); } return xReturn;