Attachment #44207 for bug #71651

View | Details | Raw Unified | Return to bug 71651
Collapse All | Expand All

Lines 125-131 Link Here

(-)cppu/test/surrogate.hxx (-2 / +2 lines)
125	rOut.clear();	125	rOut.clear();
126		126
127	typelib_TypeDescription * pTD = 0;	127	typelib_TypeDescription * pTD = 0;
128	const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal );	128	const com::sun::star::uno::Type & rType = getCppuType( &rOriginal );
129	TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );	129	TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );
130	OSL_ENSURE( pTD, "### cannot get typedescription!" );	130	OSL_ENSURE( pTD, "### cannot get typedescription!" );
131	if (pTD)	131	if (pTD)
Lines 157-163 Link Here
157	if (aCpp2Uno.is() && aUno2Cpp.is())	157	if (aCpp2Uno.is() && aUno2Cpp.is())
158	{	158	{
159	typelib_TypeDescription * pTD = 0;	159	typelib_TypeDescription * pTD = 0;
160	const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal );	160	const com::sun::star::uno::Type & rType = getCppuType( &rOriginal );
161	TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );	161	TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() );
162	OSL_ENSURE( pTD, "### cannot get typedescription!" );	162	OSL_ENSURE( pTD, "### cannot get typedescription!" );
163	if (pTD)	163	if (pTD)




{
    try
    {
        Any aRet( xObj->queryInterface( getCppuType( (const lang::IllegalArgumentException *)0 ) ) );
        OSL_ASSERT( ! aRet.hasValue() );
    }
    catch (RuntimeException &)

            
			// C++ -> UNO
			Mapping mapping( pCppEnv, pUnoEnv );
			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 ) );
            // ano C++a -> ano UNOa
			::uno_createEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );
			mapping = Mapping( pCppEnv, pUnoEnv );
			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 ) );
			(*pUnoI->release)( pUnoI );
			(*pCppEnv->release)( pCppEnv );
			(*pUnoEnv->release)( pUnoEnv );

			::uno_getEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );
			::uno_getEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );
			Mapping aCpp2Uno( pCppEnv, pUnoEnv );
			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 ) );
			(*pUnoI1->release)( pUnoI1 );
			(*pUnoEnv->release)( pUnoEnv );
			

			uno_Environment * pAnoUnoEnv = 0;
			::uno_createEnvironment( &pAnoUnoEnv, aUnoEnvTypeName.pData, 0 ); // anonymous
			Mapping aC2Uno( pCEnv, pAnoUnoEnv );
			aC2Uno.mapInterface( (void **)&pUnoI2, pC, getCppuType( &xOriginal ) );
			(*pCEnv->pExtEnv->releaseInterface)( pCEnv->pExtEnv, pC );
			(*pCEnv->release)( pCEnv );
			

			Mapping aUno2Cpp( pAnoUnoEnv, pAnoCppEnv );
			(*pAnoCppEnv->release)( pAnoCppEnv );
			(*pAnoUnoEnv->release)( pAnoUnoEnv );
			aUno2Cpp.mapInterface( (void **)&xMapped, pUnoI2, getCppuType( &xOriginal ) );
			(*pUnoI2->release)( pUnoI2 );
			}
			

			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()) ))
			{
				uno_any_destruct( &aExc, 0 );
			}

			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 ) );
			
			OSL_ENSURE(	xMapped.is(), "mapping interface failed\n");


Return to bug 71651

Lines 324-331 Link Here

(-)cppu/test/testcppu.cxx (-3 / +3 lines)
324	a3.td.dDouble = 2;	324	a3.td.dDouble = 2;
325	a3.bBool = sal_True;	325	a3.bBool = sal_True;
326	a3.aAny = makeAny( (sal_Int32)2 );	326	a3.aAny = makeAny( (sal_Int32)2 );
327	OSL_ASSERT( a3.aAny.isExtractableTo( ::getCppuType( (sal_Int64 const *)0 ) ) );	327	OSL_ASSERT( a3.aAny.isExtractableTo( getCppuType( (sal_Int64 const *)0 ) ) );
328	OSL_ASSERT( ::getCppuType( (sal_Int64 const *)0 ).isAssignableFrom( a3.aAny.getValueType() ) );	328	OSL_ASSERT( getCppuType( (sal_Int64 const *)0 ).isAssignableFrom( a3.aAny.getValueType() ) );
329	bAssignable = uno_type_assignData(	329	bAssignable = uno_type_assignData(
330	&sz3, getCppuType( (Test3*)0).getTypeLibType(),	330	&sz3, getCppuType( (Test3*)0).getTypeLibType(),
331	&a3, getCppuType( (Test3*)0).getTypeLibType(),	331	&a3, getCppuType( (Test3*)0).getTypeLibType(),
Lines 579-585 Link Here
579	static void test_assignSimple( const T & rVal, /const/ Any /&/ rAny )	579	static void test_assignSimple( const T & rVal, /const/ Any /&/ rAny )
580	{	580	{
581	typelib_TypeDescription * pTD = 0;	581	typelib_TypeDescription * pTD = 0;
582	::getCppuType( &rVal ).getDescription( &pTD );	582	getCppuType( &rVal ).getDescription( &pTD );
583	sal_Bool bTable = s_aAssignableFromTab[pTD->eTypeClass-1][rAny.getValueTypeClass()-1];	583	sal_Bool bTable = s_aAssignableFromTab[pTD->eTypeClass-1][rAny.getValueTypeClass()-1];
584	OSL_ASSERT(	584	OSL_ASSERT(
585	(bTable!=sal_False) ==	585	(bTable!=sal_False) ==

Lines 648-654 Link Here

(-)cppu/test/test_di.cxx (-11 / +11 lines)
648	{	648	{
649	try	649	try
650	{	650	{
651	Any aRet( xObj->queryInterface( ::getCppuType( (const lang::IllegalArgumentException *)0 ) ) );	651	Any aRet( xObj->queryInterface( getCppuType( (const lang::IllegalArgumentException *)0 ) ) );
652	OSL_ASSERT( ! aRet.hasValue() );	652	OSL_ASSERT( ! aRet.hasValue() );
653	}	653	}
654	catch (RuntimeException &)	654	catch (RuntimeException &)
Lines 719-742 Link Here
719		719
720	// C++ -> UNO	720	// C++ -> UNO
721	Mapping mapping( pCppEnv, pUnoEnv );	721	Mapping mapping( pCppEnv, pUnoEnv );
722	mapping.mapInterface( (void **)&pUnoI, xOriginal.get(), ::getCppuType( &xOriginal ) );	722	mapping.mapInterface( (void **)&pUnoI, xOriginal.get(), getCppuType( &xOriginal ) );
723		723
724	#ifdef EXTRA_MAPPING	724	#ifdef EXTRA_MAPPING
725	// UNO -> ano C++a	725	// UNO -> ano C++a
726	::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );	726	::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );
727	mapping = Mapping( pUnoEnv, pCppEnv );	727	mapping = Mapping( pUnoEnv, pCppEnv );
728	mapping.mapInterface( (void **)&xMapped, pUnoI, ::getCppuType( &xMapped ) );	728	mapping.mapInterface( (void **)&xMapped, pUnoI, getCppuType( &xMapped ) );
729	// ano C++a -> ano UNOa	729	// ano C++a -> ano UNOa
730	::uno_createEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );	730	::uno_createEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );
731	mapping = Mapping( pCppEnv, pUnoEnv );	731	mapping = Mapping( pCppEnv, pUnoEnv );
732	mapping.mapInterface( (void **)&pUnoI, xMapped.get(), ::getCppuType( &xMapped ) );	732	mapping.mapInterface( (void **)&pUnoI, xMapped.get(), getCppuType( &xMapped ) );
733	pExtraMapping = " <-> c++ <-> uno";	733	pExtraMapping = " <-> c++ <-> uno";
734	#endif	734	#endif
735		735
736	// ano UNOa -> ano C++b	736	// ano UNOa -> ano C++b
737	::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );	737	::uno_createEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );
738	mapping = Mapping( pUnoEnv, pCppEnv );	738	mapping = Mapping( pUnoEnv, pCppEnv );
739	mapping.mapInterface( (void **)&xMapped, pUnoI, ::getCppuType( &xMapped ) );	739	mapping.mapInterface( (void **)&xMapped, pUnoI, getCppuType( &xMapped ) );
740	(*pUnoI->release)( pUnoI );	740	(*pUnoI->release)( pUnoI );
741	(*pCppEnv->release)( pCppEnv );	741	(*pCppEnv->release)( pCppEnv );
742	(*pUnoEnv->release)( pUnoEnv );	742	(*pUnoEnv->release)( pUnoEnv );
Lines 786-799 Link Here
786	::uno_getEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );	786	::uno_getEnvironment( &pCppEnv, aCppEnvTypeName.pData, 0 );
787	::uno_getEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );	787	::uno_getEnvironment( &pUnoEnv, aUnoEnvTypeName.pData, 0 );
788	Mapping aCpp2Uno( pCppEnv, pUnoEnv );	788	Mapping aCpp2Uno( pCppEnv, pUnoEnv );
789	aCpp2Uno.mapInterface( (void **)&pUnoI1, xOriginal.get(), ::getCppuType( &xOriginal ) );	789	aCpp2Uno.mapInterface( (void **)&pUnoI1, xOriginal.get(), getCppuType( &xOriginal ) );
790	(*pCppEnv->release)( pCppEnv );	790	(*pCppEnv->release)( pCppEnv );
791		791
792	// UNO -> C	792	// UNO -> C
793	uno_Environment * pCEnv = 0;	793	uno_Environment * pCEnv = 0;
794	::uno_getEnvironment( &pCEnv, aCEnvTypeName.pData, 0 );	794	::uno_getEnvironment( &pCEnv, aCEnvTypeName.pData, 0 );
795	Mapping aUno2C( pUnoEnv, pCEnv );	795	Mapping aUno2C( pUnoEnv, pCEnv );
796	aUno2C.mapInterface( &pC, pUnoI1, ::getCppuType( &xOriginal ) );	796	aUno2C.mapInterface( &pC, pUnoI1, getCppuType( &xOriginal ) );
797	(*pUnoI1->release)( pUnoI1 );	797	(*pUnoI1->release)( pUnoI1 );
798	(*pUnoEnv->release)( pUnoEnv );	798	(*pUnoEnv->release)( pUnoEnv );
799		799
Lines 801-807 Link Here
801	uno_Environment * pAnoUnoEnv = 0;	801	uno_Environment * pAnoUnoEnv = 0;
802	::uno_createEnvironment( &pAnoUnoEnv, aUnoEnvTypeName.pData, 0 ); // anonymous	802	::uno_createEnvironment( &pAnoUnoEnv, aUnoEnvTypeName.pData, 0 ); // anonymous
803	Mapping aC2Uno( pCEnv, pAnoUnoEnv );	803	Mapping aC2Uno( pCEnv, pAnoUnoEnv );
804	aC2Uno.mapInterface( (void **)&pUnoI2, pC, ::getCppuType( &xOriginal ) );	804	aC2Uno.mapInterface( (void **)&pUnoI2, pC, getCppuType( &xOriginal ) );
805	(*pCEnv->pExtEnv->releaseInterface)( pCEnv->pExtEnv, pC );	805	(*pCEnv->pExtEnv->releaseInterface)( pCEnv->pExtEnv, pC );
806	(*pCEnv->release)( pCEnv );	806	(*pCEnv->release)( pCEnv );
807		807
Lines 811-817 Link Here
811	Mapping aUno2Cpp( pAnoUnoEnv, pAnoCppEnv );	811	Mapping aUno2Cpp( pAnoUnoEnv, pAnoCppEnv );
812	(*pAnoCppEnv->release)( pAnoCppEnv );	812	(*pAnoCppEnv->release)( pAnoCppEnv );
813	(*pAnoUnoEnv->release)( pAnoUnoEnv );	813	(*pAnoUnoEnv->release)( pAnoUnoEnv );
814	aUno2Cpp.mapInterface( (void **)&xMapped, pUnoI2, ::getCppuType( &xOriginal ) );	814	aUno2Cpp.mapInterface( (void **)&xMapped, pUnoI2, getCppuType( &xOriginal ) );
815	(*pUnoI2->release)( pUnoI2 );	815	(*pUnoI2->release)( pUnoI2 );
816	}	816	}
817		817
Lines 849-855 Link Here
849	OSL_ENSURE( pXIface != 0, "create test object failed\n");	849	OSL_ENSURE( pXIface != 0, "create test object failed\n");
850		850
851	/* Get interface XFoo2 */	851	/* Get interface XFoo2 */
852	if (CUNO_EXCEPTION_OCCURED( CUNO_CALL(pXIface)->queryInterface( pXIface, &aExc, (com_sun_star_uno_XInterface**)&pXLBTest, ::getCppuType( &xMapped ).getTypeLibType()) ))	852	if (CUNO_EXCEPTION_OCCURED( CUNO_CALL(pXIface)->queryInterface( pXIface, &aExc, (com_sun_star_uno_XInterface**)&pXLBTest, getCppuType( &xMapped ).getTypeLibType()) ))
853	{	853	{
854	uno_any_destruct( &aExc, 0 );	854	uno_any_destruct( &aExc, 0 );
855	}	855	}
Lines 858-864 Link Here
858	Mapping aC2Cpp(	858	Mapping aC2Cpp(
859	OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_C) ),	859	OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_C) ),
860	OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );	860	OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );
861	aC2Cpp.mapInterface( (void **)&xMapped, pXLBTest, ::getCppuType( &xMapped ) );	861	aC2Cpp.mapInterface( (void **)&xMapped, pXLBTest, getCppuType( &xMapped ) );
862		862
863	OSL_ENSURE( xMapped.is(), "mapping interface failed\n");	863	OSL_ENSURE( xMapped.is(), "mapping interface failed\n");
864		864