Submitted By: DJ Lucas Date: 2005-10-06 Origin: Previous OOo-1.1.4-gcc-3.4.2+ patch, OOo CVS, self Initial Package Version: 1.1.5 Description: Fixes build issues with gcc-4. $LastChangedBy: dj $ $Date: 2005-10-06 19:29:58 -0500 (Thu, 06 Oct 2005) $ diff -Naur OOo_1.1.5-orig/autodoc/source/ary/cpp/c_gate.cxx OOo_1.1.5/autodoc/source/ary/cpp/c_gate.cxx --- OOo_1.1.5-orig/autodoc/source/ary/cpp/c_gate.cxx 2003-06-30 10:25:45.000000000 -0500 +++ OOo_1.1.5/autodoc/source/ary/cpp/c_gate.cxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/ary/cpp/prpr.cxx OOo_1.1.5/autodoc/source/ary/cpp/prpr.cxx --- OOo_1.1.5-orig/autodoc/source/ary/cpp/prpr.cxx 2002-03-08 08:45:18.000000000 -0600 +++ OOo_1.1.5/autodoc/source/ary/cpp/prpr.cxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/ary/inc/nametreenode.hxx OOo_1.1.5/autodoc/source/ary/inc/nametreenode.hxx --- OOo_1.1.5-orig/autodoc/source/ary/inc/nametreenode.hxx 2003-03-18 08:11:34.000000000 -0600 +++ OOo_1.1.5/autodoc/source/ary/inc/nametreenode.hxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/ary/inc/store/st_iterator.hxx OOo_1.1.5/autodoc/source/ary/inc/store/st_iterator.hxx --- OOo_1.1.5-orig/autodoc/source/ary/inc/store/st_iterator.hxx 2002-11-01 11:13:57.000000000 -0600 +++ OOo_1.1.5/autodoc/source/ary/inc/store/st_iterator.hxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/ary/store/t_storg.hxx OOo_1.1.5/autodoc/source/ary/store/t_storg.hxx --- OOo_1.1.5-orig/autodoc/source/ary/store/t_storg.hxx 2003-07-02 08:49:27.000000000 -0500 +++ OOo_1.1.5/autodoc/source/ary/store/t_storg.hxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/ary/store/ti_storg.hxx OOo_1.1.5/autodoc/source/ary/store/ti_storg.hxx --- OOo_1.1.5-orig/autodoc/source/ary/store/ti_storg.hxx 2002-03-08 08:45:20.000000000 -0600 +++ OOo_1.1.5/autodoc/source/ary/store/ti_storg.hxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/display/html/hdimpl.cxx OOo_1.1.5/autodoc/source/display/html/hdimpl.cxx --- OOo_1.1.5-orig/autodoc/source/display/html/hdimpl.cxx 2003-03-18 08:11:36.000000000 -0600 +++ OOo_1.1.5/autodoc/source/display/html/hdimpl.cxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/display/toolkit/out_position.cxx OOo_1.1.5/autodoc/source/display/toolkit/out_position.cxx --- OOo_1.1.5-orig/autodoc/source/display/toolkit/out_position.cxx 2002-11-01 11:15:27.000000000 -0600 +++ OOo_1.1.5/autodoc/source/display/toolkit/out_position.cxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/inc/estack.hxx OOo_1.1.5/autodoc/source/inc/estack.hxx --- OOo_1.1.5-orig/autodoc/source/inc/estack.hxx 2003-06-30 10:27:34.000000000 -0500 +++ OOo_1.1.5/autodoc/source/inc/estack.hxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/parser/cpp/cx_c_pp.cxx OOo_1.1.5/autodoc/source/parser/cpp/cx_c_pp.cxx --- OOo_1.1.5-orig/autodoc/source/parser/cpp/cx_c_pp.cxx 2003-03-18 08:11:41.000000000 -0600 +++ OOo_1.1.5/autodoc/source/parser/cpp/cx_c_pp.cxx 2005-10-03 21:37:56.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_1.1.5-orig/autodoc/source/parser_i/idl/tk_keyw.cxx OOo_1.1.5/autodoc/source/parser_i/idl/tk_keyw.cxx --- OOo_1.1.5-orig/autodoc/source/parser_i/idl/tk_keyw.cxx 2002-11-01 11:15:41.000000000 -0600 +++ OOo_1.1.5/autodoc/source/parser_i/idl/tk_keyw.cxx 2005-10-03 21:37:56.000000000 -0500 @@ -137,15 +137,15 @@ namespace lux { -EnumValueMap & +template<> EnumValueMap & TokBuiltInType::EV_TokenId::Values_() { return G_aTokBuiltInType_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & TokTypeModifier::EV_TokenId::Values_() { return G_aTokTypeModifier_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & TokMetaType::EV_TokenId::Values_() { return G_aTokMetaType_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } } // namespace lux diff -Naur OOo_1.1.5-orig/autodoc/source/parser_i/idl/tk_punct.cxx OOo_1.1.5/autodoc/source/parser_i/idl/tk_punct.cxx --- OOo_1.1.5-orig/autodoc/source/parser_i/idl/tk_punct.cxx 2004-03-25 05:33:03.000000000 -0600 +++ OOo_1.1.5/autodoc/source/parser_i/idl/tk_punct.cxx 2005-10-03 21:37:56.000000000 -0500 @@ -90,7 +90,7 @@ namespace lux { -EnumValueMap & +template<> EnumValueMap & TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } } diff -Naur OOo_1.1.5-orig/autodoc/source/parser_i/idoc/tk_atag2.cxx OOo_1.1.5/autodoc/source/parser_i/idoc/tk_atag2.cxx --- OOo_1.1.5-orig/autodoc/source/parser_i/idoc/tk_atag2.cxx 2003-06-10 06:35:20.000000000 -0500 +++ OOo_1.1.5/autodoc/source/parser_i/idoc/tk_atag2.cxx 2005-10-03 21:37:56.000000000 -0500 @@ -90,7 +90,7 @@ namespace lux { -EnumValueMap & +template<> EnumValueMap & Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } } diff -Naur OOo_1.1.5-orig/autodoc/source/parser_i/idoc/tk_xml.cxx OOo_1.1.5/autodoc/source/parser_i/idoc/tk_xml.cxx --- OOo_1.1.5-orig/autodoc/source/parser_i/idoc/tk_xml.cxx 2002-05-14 04:02:21.000000000 -0500 +++ OOo_1.1.5/autodoc/source/parser_i/idoc/tk_xml.cxx 2005-10-03 21:37:56.000000000 -0500 @@ -94,11 +94,11 @@ namespace lux { -EnumValueMap & +template<> EnumValueMap & Tok_XmlConst::EV_TokenId::Values_() { return G_aTok_XmlConst_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_TokenId_Values; } -EnumValueMap & +template<> EnumValueMap & Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } } // namespace lux diff -Naur OOo_1.1.5-orig/automation/source/server/statemnt.hxx OOo_1.1.5/automation/source/server/statemnt.hxx --- OOo_1.1.5-orig/automation/source/server/statemnt.hxx 2003-06-10 06:29:57.000000000 -0500 +++ OOo_1.1.5/automation/source/server/statemnt.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -111,6 +111,7 @@ #endif class Window; +class SystemWindow; class Point; class SfxPoolItem; @@ -351,7 +352,7 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, resetaplication ...) { - friend ImplRemoteControl; + friend class ImplRemoteControl; protected: USHORT nMethodId; USHORT nParams; diff -Naur OOo_1.1.5-orig/basctl/source/inc/bastypes.hxx OOo_1.1.5/basctl/source/inc/bastypes.hxx --- OOo_1.1.5-orig/basctl/source/inc/bastypes.hxx 2003-04-23 11:40:01.000000000 -0500 +++ OOo_1.1.5/basctl/source/inc/bastypes.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -218,6 +218,7 @@ #define BASWIN_SUSPENDED 0x04 #define BASWIN_INRESCHEDULE 0x08 +class Printer; class SfxUndoManager; class SfxObjectShell; diff -Naur OOo_1.1.5-orig/basctl/source/inc/dlgedobj.hxx OOo_1.1.5/basctl/source/inc/dlgedobj.hxx --- OOo_1.1.5-orig/basctl/source/inc/dlgedobj.hxx 2003-04-11 12:39:10.000000000 -0500 +++ OOo_1.1.5/basctl/source/inc/dlgedobj.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -79,8 +79,10 @@ #endif #include +#include class DlgEdForm; +class DlgEditor; //============================================================================ // DlgEdObj diff -Naur OOo_1.1.5-orig/basic/inc/sbdef.hxx OOo_1.1.5/basic/inc/sbdef.hxx --- OOo_1.1.5-orig/basic/inc/sbdef.hxx 2004-10-12 05:56:33.000000000 -0500 +++ OOo_1.1.5/basic/inc/sbdef.hxx 2005-10-03 21:37:56.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_1.1.5-orig/basic/source/app/appwin.hxx OOo_1.1.5/basic/source/app/appwin.hxx --- OOo_1.1.5-orig/basic/source/app/appwin.hxx 2002-03-28 08:43:03.000000000 -0600 +++ OOo_1.1.5/basic/source/app/appwin.hxx 2005-10-03 21:37:56.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_1.1.5-orig/basic/source/app/comm_bas.cxx OOo_1.1.5/basic/source/app/comm_bas.cxx --- OOo_1.1.5-orig/basic/source/app/comm_bas.cxx 2000-09-18 11:12:08.000000000 -0500 +++ OOo_1.1.5/basic/source/app/comm_bas.cxx 2005-10-03 21:37:56.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_1.1.5-orig/bridges/source/remote/urp/urp_cache.hxx OOo_1.1.5/bridges/source/remote/urp/urp_cache.hxx --- OOo_1.1.5-orig/bridges/source/remote/urp/urp_cache.hxx 2001-08-31 11:16:52.000000000 -0500 +++ OOo_1.1.5/bridges/source/remote/urp/urp_cache.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -60,6 +60,7 @@ ************************************************************************/ #include #include +#include #ifndef _RTL_USTRING_HXX_ #include diff -Naur OOo_1.1.5-orig/codemaker/source/cppumaker/cpputype.cxx OOo_1.1.5/codemaker/source/cppumaker/cpputype.cxx --- OOo_1.1.5-orig/codemaker/source/cppumaker/cpputype.cxx 2004-01-28 09:27:37.000000000 -0600 +++ OOo_1.1.5/codemaker/source/cppumaker/cpputype.cxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/broadcasthelper.hxx OOo_1.1.5/comphelper/inc/comphelper/broadcasthelper.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/broadcasthelper.hxx 2002-04-23 06:04:56.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/broadcasthelper.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/extract.hxx OOo_1.1.5/comphelper/inc/comphelper/extract.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/extract.hxx 2001-03-07 07:55:53.000000000 -0600 +++ OOo_1.1.5/comphelper/inc/comphelper/extract.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/guarding.hxx OOo_1.1.5/comphelper/inc/comphelper/guarding.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/guarding.hxx 2000-09-29 06:28:15.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/guarding.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/proparrhlp.hxx OOo_1.1.5/comphelper/inc/comphelper/proparrhlp.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/proparrhlp.hxx 2003-03-19 09:58:31.000000000 -0600 +++ OOo_1.1.5/comphelper/inc/comphelper/proparrhlp.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -175,6 +175,6 @@ } //... namespace comphelper ................................................ -#endif _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ diff -Naur OOo_1.1.5-orig/comphelper/inc/comphelper/property.hxx OOo_1.1.5/comphelper/inc/comphelper/property.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/property.hxx 2003-03-19 09:58:31.000000000 -0600 +++ OOo_1.1.5/comphelper/inc/comphelper/property.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/propmultiplex.hxx OOo_1.1.5/comphelper/inc/comphelper/propmultiplex.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/propmultiplex.hxx 2001-05-31 08:54:33.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/propmultiplex.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -76,6 +76,8 @@ //......................................................................... namespace comphelper { + class OPropertyChangeMultiplexer; + //......................................................................... //================================================================== diff -Naur OOo_1.1.5-orig/comphelper/inc/comphelper/querydeep.hxx OOo_1.1.5/comphelper/inc/comphelper/querydeep.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/querydeep.hxx 2000-09-29 06:28:15.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/querydeep.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/sequence.hxx OOo_1.1.5/comphelper/inc/comphelper/sequence.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/sequence.hxx 2001-04-20 07:29:47.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/sequence.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/servicehelper.hxx OOo_1.1.5/comphelper/inc/comphelper/servicehelper.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/servicehelper.hxx 2001-03-14 09:52:37.000000000 -0600 +++ OOo_1.1.5/comphelper/inc/comphelper/servicehelper.hxx 2005-10-03 21:37:56.000000000 -0500 @@ -135,5 +135,5 @@ } -#endif _UTL_SERVICEHELPER_HXX_ +#endif // _UTL_SERVICEHELPER_HXX_ diff -Naur OOo_1.1.5-orig/comphelper/inc/comphelper/types.hxx OOo_1.1.5/comphelper/inc/comphelper/types.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/types.hxx 2000-11-19 09:20:37.000000000 -0600 +++ OOo_1.1.5/comphelper/inc/comphelper/types.hxx 2005-10-03 21:37:56.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_1.1.5-orig/comphelper/inc/comphelper/uno3.hxx OOo_1.1.5/comphelper/inc/comphelper/uno3.hxx --- OOo_1.1.5-orig/comphelper/inc/comphelper/uno3.hxx 2002-04-23 06:06:59.000000000 -0500 +++ OOo_1.1.5/comphelper/inc/comphelper/uno3.hxx 2005-10-03 21:37:56.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_1.1.5-orig/config_office/configure OOo_1.1.5/config_office/configure --- OOo_1.1.5-orig/config_office/configure 2005-07-08 02:55:43.000000000 -0500 +++ OOo_1.1.5/config_office/configure 2005-10-03 21:37:57.000000000 -0500 @@ -3198,7 +3198,7 @@ _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` - if test "$_gcc_major" = "3"; then + if test "$_gcc_major" -ge "3"; then USE_GCC3="TRUE" if test "$_gcc_longver" -eq "030203"; then if test "$ENABLE_SYMBOLS" = "SMALL"; then diff -Naur OOo_1.1.5-orig/configmgr/source/api2/apinodeaccess.hxx OOo_1.1.5/configmgr/source/api2/apinodeaccess.hxx --- OOo_1.1.5-orig/configmgr/source/api2/apinodeaccess.hxx 2003-03-19 10:18:29.000000000 -0600 +++ OOo_1.1.5/configmgr/source/api2/apinodeaccess.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -66,6 +66,14 @@ #include "utility.hxx" #endif +#ifndef CONFIGMGR_CONFIGNODE_HXX_ +#include "noderef.hxx" +#endif + +#ifndef CONFIGMGR_ACCESSOR_HXX +#include +#endif + namespace osl { class Mutex; } namespace configmgr diff -Naur OOo_1.1.5-orig/configmgr/source/api2/apinodeupdate.hxx OOo_1.1.5/configmgr/source/api2/apinodeupdate.hxx --- OOo_1.1.5-orig/configmgr/source/api2/apinodeupdate.hxx 2003-03-19 10:18:29.000000000 -0600 +++ OOo_1.1.5/configmgr/source/api2/apinodeupdate.hxx 2005-10-03 21:37:57.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_1.1.5-orig/configmgr/source/api2/confproviderimpl2.hxx OOo_1.1.5/configmgr/source/api2/confproviderimpl2.hxx --- OOo_1.1.5-orig/configmgr/source/api2/confproviderimpl2.hxx 2003-03-19 10:18:31.000000000 -0600 +++ OOo_1.1.5/configmgr/source/api2/confproviderimpl2.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -79,6 +79,8 @@ namespace uno = css::uno; namespace script = css::script; + class OConfigurationProvider; + class OConfigurationProviderImpl : public OProviderImpl { friend class OConfigurationProvider; diff -Naur OOo_1.1.5-orig/configmgr/source/api2/listenercontainer.hxx OOo_1.1.5/configmgr/source/api2/listenercontainer.hxx --- OOo_1.1.5-orig/configmgr/source/api2/listenercontainer.hxx 2003-03-19 10:18:34.000000000 -0600 +++ OOo_1.1.5/configmgr/source/api2/listenercontainer.hxx 2005-10-03 21:37:57.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_1.1.5-orig/configmgr/source/api2/providerimpl.hxx OOo_1.1.5/configmgr/source/api2/providerimpl.hxx --- OOo_1.1.5-orig/configmgr/source/api2/providerimpl.hxx 2003-03-19 10:18:36.000000000 -0600 +++ OOo_1.1.5/configmgr/source/api2/providerimpl.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -130,6 +130,7 @@ class IConfigDefaultProvider; class TreeManager; class ContextReader; + class OProvider; struct IConfigBroadcaster; diff -Naur OOo_1.1.5-orig/configmgr/source/inc/pointer.hxx OOo_1.1.5/configmgr/source/inc/pointer.hxx --- OOo_1.1.5-orig/configmgr/source/inc/pointer.hxx 2002-03-28 02:47:03.000000000 -0600 +++ OOo_1.1.5/configmgr/source/inc/pointer.hxx 2005-10-03 21:37:57.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_1.1.5-orig/configmgr/source/inc/treeaccessor.hxx OOo_1.1.5/configmgr/source/inc/treeaccessor.hxx --- OOo_1.1.5-orig/configmgr/source/inc/treeaccessor.hxx 2003-04-01 07:34:24.000000000 -0600 +++ OOo_1.1.5/configmgr/source/inc/treeaccessor.hxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/inc/connectivity/sqliterator.hxx OOo_1.1.5/connectivity/inc/connectivity/sqliterator.hxx --- OOo_1.1.5-orig/connectivity/inc/connectivity/sqliterator.hxx 2002-07-15 07:34:30.000000000 -0500 +++ OOo_1.1.5/connectivity/inc/connectivity/sqliterator.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -99,6 +99,7 @@ { class OSQLParseNode; + class OSQLParser; enum OSQLStatementType { @@ -140,6 +141,8 @@ #define RET_HANDLED 2 // der Fehler wurde schon behandelt, das Parsen soll (mit Status auf Success) abgebrochen werden #define RET_BREAK 3 // Abbrechen, Status-Fehlercode setzen + struct OSQLParseTreeIteratorImpl; + class OSQLParseTreeIterator { public: diff -Naur OOo_1.1.5-orig/connectivity/source/drivers/jdbc/Connection.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/Connection.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/Connection.cxx 2003-06-06 05:50:29.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/Connection.cxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 2003-04-24 08:20:00.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 2003-04-24 08:20:29.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 2005-10-03 21:37:57.000000000 -0500 @@ -184,7 +184,12 @@ { jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); if(id) - return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); + return copyArrayAndDelete( + t.pEnv, + (jobjectArray)t.pEnv->GetObjectField( object, id), + static_cast< const ::rtl::OUString* >( NULL ), + static_cast< const java_lang_String* >(NULL) + ); } //t.pEnv return Sequence< ::rtl::OUString>(); } diff -Naur OOo_1.1.5-orig/connectivity/source/drivers/jdbc/ResultSet.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/ResultSet.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/ResultSet.cxx 2003-04-24 08:21:49.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/ResultSet.cxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/jdbc/SQLException.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/SQLException.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/SQLException.cxx 2003-04-24 08:22:09.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/SQLException.cxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/jdbc/Statement.cxx OOo_1.1.5/connectivity/source/drivers/jdbc/Statement.cxx --- OOo_1.1.5-orig/connectivity/source/drivers/jdbc/Statement.cxx 2003-04-24 08:22:28.000000000 -0500 +++ OOo_1.1.5/connectivity/source/drivers/jdbc/Statement.cxx 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/mozab/makefile.mk OOo_1.1.5/connectivity/source/drivers/mozab/makefile.mk --- OOo_1.1.5-orig/connectivity/source/drivers/mozab/makefile.mk 2004-01-09 09:00:54.000000000 -0600 +++ OOo_1.1.5/connectivity/source/drivers/mozab/makefile.mk 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/drivers/mozab/mozillasrc/makefile.mk OOo_1.1.5/connectivity/source/drivers/mozab/mozillasrc/makefile.mk --- OOo_1.1.5-orig/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 2004-01-09 09:00:55.000000000 -0600 +++ OOo_1.1.5/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 2005-10-03 21:37:57.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_1.1.5-orig/connectivity/source/inc/file/fcomp.hxx OOo_1.1.5/connectivity/source/inc/file/fcomp.hxx --- OOo_1.1.5-orig/connectivity/source/inc/file/fcomp.hxx 2002-07-05 03:07:52.000000000 -0500 +++ OOo_1.1.5/connectivity/source/inc/file/fcomp.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -75,6 +75,7 @@ { class OCode; class OOperand; + class OSQLAnalyzer; typedef::std::vector OCodeList; class OPredicateCompiler diff -Naur OOo_1.1.5-orig/connectivity/source/inc/java/tools.hxx OOo_1.1.5/connectivity/source/inc/java/tools.hxx --- OOo_1.1.5-orig/connectivity/source/inc/java/tools.hxx 2002-11-01 04:58:49.000000000 -0600 +++ OOo_1.1.5/connectivity/source/inc/java/tools.hxx 2005-10-03 21:37:57.000000000 -0500 @@ -101,7 +101,7 @@ java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) + template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T*, const JT* ) { ::com::sun::star::uno::Sequence< T > xOut; if(_Array) diff -Naur OOo_1.1.5-orig/connectivity/source/parse/sqlNoException.cxx OOo_1.1.5/connectivity/source/parse/sqlNoException.cxx --- OOo_1.1.5-orig/connectivity/source/parse/sqlNoException.cxx 2004-01-09 09:00:58.000000000 -0600 +++ OOo_1.1.5/connectivity/source/parse/sqlNoException.cxx 2005-10-03 21:37:57.000000000 -0500 @@ -119,8 +119,6 @@ } // ----------------------------------------------------------------------------- } -// ----------------------------------------------------------------------------- -DBG_NAME(OSQLParseNode); //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue, SQLNodeType eNewNodeType, diff -Naur OOo_1.1.5-orig/cppu/inc/com/sun/star/uno/Any.hxx OOo_1.1.5/cppu/inc/com/sun/star/uno/Any.hxx --- OOo_1.1.5-orig/cppu/inc/com/sun/star/uno/Any.hxx 2002-08-19 02:18:44.000000000 -0500 +++ OOo_1.1.5/cppu/inc/com/sun/star/uno/Any.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/inc/com/sun/star/uno/Reference.hxx OOo_1.1.5/cppu/inc/com/sun/star/uno/Reference.hxx --- OOo_1.1.5-orig/cppu/inc/com/sun/star/uno/Reference.hxx 2002-08-21 04:19:06.000000000 -0500 +++ OOo_1.1.5/cppu/inc/com/sun/star/uno/Reference.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/inc/com/sun/star/uno/Sequence.hxx OOo_1.1.5/cppu/inc/com/sun/star/uno/Sequence.hxx --- OOo_1.1.5-orig/cppu/inc/com/sun/star/uno/Sequence.hxx 2004-01-28 04:19:00.000000000 -0600 +++ OOo_1.1.5/cppu/inc/com/sun/star/uno/Sequence.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/inc/com/sun/star/uno/Type.hxx OOo_1.1.5/cppu/inc/com/sun/star/uno/Type.hxx --- OOo_1.1.5-orig/cppu/inc/com/sun/star/uno/Type.hxx 2002-08-21 04:19:08.000000000 -0500 +++ OOo_1.1.5/cppu/inc/com/sun/star/uno/Type.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/inc/uno/lbnames.h OOo_1.1.5/cppu/inc/uno/lbnames.h --- OOo_1.1.5-orig/cppu/inc/uno/lbnames.h 2003-04-28 11:26:36.000000000 -0500 +++ OOo_1.1.5/cppu/inc/uno/lbnames.h 2005-10-03 21:37:57.000000000 -0500 @@ -94,7 +94,9 @@ #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__ == 4 && __GNUC_MINOR__ == 0) #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_1.1.5-orig/cppu/inc/uno/mapping.hxx OOo_1.1.5/cppu/inc/uno/mapping.hxx --- OOo_1.1.5-orig/cppu/inc/uno/mapping.hxx 2001-11-09 03:14:30.000000000 -0600 +++ OOo_1.1.5/cppu/inc/uno/mapping.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/test/surrogate.hxx OOo_1.1.5/cppu/test/surrogate.hxx --- OOo_1.1.5-orig/cppu/test/surrogate.hxx 2001-03-12 07:28:13.000000000 -0600 +++ OOo_1.1.5/cppu/test/surrogate.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/test/test_di.cxx OOo_1.1.5/cppu/test/test_di.cxx --- OOo_1.1.5-orig/cppu/test/test_di.cxx 2002-08-19 02:18:48.000000000 -0500 +++ OOo_1.1.5/cppu/test/test_di.cxx 2005-10-03 21:37:57.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_1.1.5-orig/cppu/test/testcppu.cxx OOo_1.1.5/cppu/test/testcppu.cxx --- OOo_1.1.5-orig/cppu/test/testcppu.cxx 2002-08-19 02:18:49.000000000 -0500 +++ OOo_1.1.5/cppu/test/testcppu.cxx 2005-10-03 21:37:57.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_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase1.hxx OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase1.hxx --- OOo_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase1.hxx 2004-01-28 09:29:53.000000000 -0600 +++ OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase1.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase10.hxx OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase10.hxx --- OOo_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase10.hxx 2004-01-28 09:30:23.000000000 -0600 +++ OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase10.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase11.hxx OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase11.hxx --- OOo_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase11.hxx 2004-01-28 09:30:54.000000000 -0600 +++ OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase11.hxx 2005-10-03 21:37:57.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_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase12.hxx OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase12.hxx --- OOo_1.1.5-orig/cppuhelper/inc/cppuhelper/compbase12.hxx 2004-01-28 09:31:29.000000000 -0600 +++ OOo_1.1.5/cppuhelper/inc/cppuhelper/compbase12.hxx 2005-10-03 21:37:57.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,