Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 44207 Details for
Bug 71651
OpenOffice/Ximian GCC-3.4 patchset - cppu module has some unneeded patches
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
module cppu undo patch
gcc34-undo.patch (text/plain), 6.14 KB, created by
Hanno Zysik (geki)
on 2004-11-18 03:21:40 UTC
(
hide
)
Description:
module cppu undo patch
Filename:
MIME Type:
Creator:
Hanno Zysik (geki)
Created:
2004-11-18 03:21:40 UTC
Size:
6.14 KB
patch
obsolete
>--- cppu/test/surrogate.hxx 2001-03-12 14:28:13.000000000 +0100 >+++ cppu/test/surrogate.hxx 2004-11-03 00:25:00.525527840 +0100 >@@ -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) >--- cppu/test/testcppu.cxx 2002-08-19 09:18:49.000000000 +0200 >+++ cppu/test/testcppu.cxx 2004-11-03 00:25:00.548524344 +0100 >@@ -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) == >--- cppu/test/test_di.cxx 2002-08-19 09:18:48.000000000 +0200 >+++ cppu/test/test_di.cxx 2004-11-03 00:25:00.532526776 +0100 >@@ -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"); >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 71651
: 44207