diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:10 +0200 |
| commit | e1f3391a749873875e2e65bf9f36d242702b8006 (patch) | |
| tree | 3b4df0931cb7f1540471e1dafa51a4a18e98eea3 /stoc/test/testiadapter.cxx | |
| parent | 72a11e4544c900f0b83fbdcae11eb247d65e9666 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I14b923990a012e8e85ca9170cdffd6b8e3626d89
Diffstat (limited to 'stoc/test/testiadapter.cxx')
| -rw-r--r-- | stoc/test/testiadapter.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 097597f927e2..5099f886aa75 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -406,8 +406,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName, rOutParamIndex[16] = 16; rOutParam.realloc( 17 ); - rOutParam[0].setValue( &aBool, ::getCppuBooleanType() ); - rOutParam[1].setValue( &aChar, ::getCppuCharType() ); + rOutParam[0].setValue( &aBool, cppu::UnoType<bool>::get() ); + rOutParam[1].setValue( &aChar, cppu::UnoType<cppu::UnoCharType>::get() ); rOutParam[2] <<= nByte; rOutParam[3] <<= nShort; rOutParam[4] <<= nUShort; @@ -450,8 +450,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName, rOutParamIndex[16] = 16; rOutParam.realloc( 17 ); - rOutParam[0].setValue( &aBool, ::getCppuBooleanType() ); - rOutParam[1].setValue( &aChar, ::getCppuCharType() ); + rOutParam[0].setValue( &aBool, cppu::UnoType<bool>::get() ); + rOutParam[1].setValue( &aChar, cppu::UnoType<cppu::UnoCharType>::get() ); rOutParam[2] <<= nByte; rOutParam[3] <<= nShort; rOutParam[4] <<= nUShort; @@ -494,8 +494,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName, rOutParamIndex[16] = 16; rOutParam.realloc( 17 ); - rOutParam[0].setValue( &aBool, ::getCppuBooleanType() ); - rOutParam[1].setValue( &aChar, ::getCppuCharType() ); + rOutParam[0].setValue( &aBool, cppu::UnoType<bool>::get() ); + rOutParam[1].setValue( &aChar, cppu::UnoType<cppu::UnoCharType>::get() ); rOutParam[2] <<= nByte; rOutParam[3] <<= nShort; rOutParam[4] <<= nUShort; @@ -588,14 +588,14 @@ Any XLB_Invocation::getValue( const OUString & rName ) if ( rName == "Bool" ) { sal_Bool aBool = _xLBT->getBool(); - aRet.setValue( &aBool, ::getCppuBooleanType() ); + aRet.setValue( &aBool, cppu::UnoType<bool>::get() ); } else if ( rName == "Byte" ) aRet <<= _xLBT->getByte(); else if ( rName == "Char" ) { sal_Unicode aChar = _xLBT->getChar(); - aRet.setValue( &aChar, ::getCppuCharType() ); + aRet.setValue( &aChar, cppu::UnoType<cppu::UnoCharType>::get() ); } else if ( rName == "Short" ) aRet <<= _xLBT->getShort(); @@ -986,7 +986,7 @@ static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr xMgr->createInstance("com.sun.star.script.Invocation"), UNO_QUERY ); Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() ); - Any aOriginal( &xOriginal, ::getCppuType( &xOriginal ) ); + Any aOriginal( &xOriginal, cppu::UnoType<decltype(xOriginal)>::get() ); Reference< XInvocation > xInvok( xInvocFac->createInstanceWithArguments( Sequence< Any >( &aOriginal, 1 ) ), UNO_QUERY ); |