mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant Reference<> from within UnoType<> uses

Browse Source 
Change-Id: I1aeb9c73c284e39f371e49ded98e8dba0d055056
This commit is contained in:
Stephan Bergmann
2015-04-01 10:42:11 +02:00
parent 3e672693e3
commit 31e24f487e
9 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
binaryurp/source/bridge.cxx
View File

@@ -864,8 +864,7 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
" character"); " character");
} }
} }
css::uno::TypeDescription ifc( css::uno::TypeDescription ifc(cppu::UnoType<css::uno::XInterface>::get());
cppu::UnoType< css::uno::Reference< css::uno::XInterface > >::get());
typelib_TypeDescription * p = ifc.get(); typelib_TypeDescription * p = ifc.get();
std::vector< BinaryAny > inArgs; std::vector< BinaryAny > inArgs;
inArgs.push_back( inArgs.push_back(

3
binaryurp/source/reader.cxx
View File

@@ -215,8 +215,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
css::uno::UnoInterfaceReference cc; css::uno::UnoInterfaceReference cc;
if (ccMode) { if (ccMode) {
css::uno::TypeDescription t( css::uno::TypeDescription t(
cppu::UnoType< css::uno::Reference< css::uno::XCurrentContext > >:: cppu::UnoType<css::uno::XCurrentContext>::get());
get());
cc.set( cc.set(
*static_cast< uno_Interface ** >( *static_cast< uno_Interface ** >(
unmarshal.readValue(t).getValue(t))); unmarshal.readValue(t).getValue(t)));

8
chart2/source/controller/main/ChartController_Window.cxx
View File

@@ -1598,7 +1598,7 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
bSuccess = true; bSuccess = true;
} }
} }
else if ( rType == cppu::UnoType< uno::Reference< drawing::XShape > >::get() ) else if ( rType == cppu::UnoType<drawing::XShape>::get() )
{ {
uno::Reference< drawing::XShape > xShape; uno::Reference< drawing::XShape > xShape;
if ( ( rSelection >>= xShape ) && m_aSelection.setSelection( xShape ) ) if ( ( rSelection >>= xShape ) && m_aSelection.setSelection( xShape ) )
@@ -1664,7 +1664,7 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
return; //behave passive if already disposed or suspended return; //behave passive if already disposed or suspended
//--add listener //--add listener
m_aLifeTimeManager.m_aListenerContainer.addInterface( cppu::UnoType< uno::Reference< view::XSelectionChangeListener > >::get(), xListener ); m_aLifeTimeManager.m_aListenerContainer.addInterface( cppu::UnoType<view::XSelectionChangeListener>::get(), xListener );
} }
void SAL_CALL ChartController void SAL_CALL ChartController
@@ -1677,14 +1677,14 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
return; //behave passive if already disposed or suspended return; //behave passive if already disposed or suspended
//--remove listener //--remove listener
m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType< uno::Reference< view::XSelectionChangeListener > >::get(), xListener ); m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<view::XSelectionChangeListener>::get(), xListener );
} }
void ChartController void ChartController
::impl_notifySelectionChangeListeners() ::impl_notifySelectionChangeListeners()
{ {
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
.getContainer( cppu::UnoType< uno::Reference< view::XSelectionChangeListener > >::get() ); .getContainer( cppu::UnoType<view::XSelectionChangeListener>::get() );
if( pIC ) if( pIC )
{ {
uno::Reference< view::XSelectionSupplier > xSelectionSupplier(this); uno::Reference< view::XSelectionSupplier > xSelectionSupplier(this);

4
connectivity/source/commontools/dbtools.cxx
View File

@@ -1522,7 +1522,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
break; break;
case TypeClass_INTERFACE: case TypeClass_INTERFACE:
if (_rValue.getValueType() == cppu::UnoType<Reference< XInputStream> >::get()) if (_rValue.getValueType() == cppu::UnoType<XInputStream>::get())
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
_rValue >>= xStream; _rValue >>= xStream;
@@ -1629,7 +1629,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters,
break; break;
case TypeClass_INTERFACE: case TypeClass_INTERFACE:
if (_rValue.getValueType() == cppu::UnoType<Reference< XInputStream> >::get()) if (_rValue.getValueType() == cppu::UnoType<XInputStream>::get())
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
_rValue >>= xStream; _rValue >>= xStream;

6
connectivity/source/drivers/firebird/StatementCommonBase.cxx
View File

@@ -90,9 +90,9 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru
Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException, std::exception) Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException, std::exception)
{ {
::cppu::OTypeCollection aTypes( ::cppu::OTypeCollection aTypes(
::cppu::UnoType< uno::Reference< XMultiPropertySet > >::get(), ::cppu::UnoType<XMultiPropertySet>::get(),
::cppu::UnoType< uno::Reference< XFastPropertySet > >::get(), ::cppu::UnoType<XFastPropertySet>::get(),
::cppu::UnoType< uno::Reference< XPropertySet > >::get()); ::cppu::UnoType<XPropertySet>::get());
return concatSequences(aTypes.getTypes(),OStatementCommonBase_Base::getTypes()); return concatSequences(aTypes.getTypes(),OStatementCommonBase_Base::getTypes());
} }

14
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
View File

@@ -111,7 +111,7 @@ public:
Any MyService1Impl::queryInterface( Type const & type ) Any MyService1Impl::queryInterface( Type const & type )
throw (RuntimeException) throw (RuntimeException)
{ {
if (type.equals(::cppu::UnoType< Reference< XInterface > >::get())) if (type.equals(::cppu::UnoType<XInterface>::get()))
{ {
// return XInterface interface // return XInterface interface
// (resolve ambiguity by casting to lang::XTypeProvider) // (resolve ambiguity by casting to lang::XTypeProvider)
@@ -119,21 +119,21 @@ Any MyService1Impl::queryInterface( Type const & type )
static_cast< lang::XTypeProvider * >( this ) ); static_cast< lang::XTypeProvider * >( this ) );
return makeAny( x ); return makeAny( x );
} }
if (type.equals(::cppu::UnoType< Reference< lang::XTypeProvider > >::get())) if (type.equals(::cppu::UnoType<lang::XTypeProvider>::get()))
{ {
// return XInterface interface // return XInterface interface
Reference< XInterface > x( Reference< XInterface > x(
static_cast< lang::XTypeProvider * >( this ) ); static_cast< lang::XTypeProvider * >( this ) );
return makeAny( x ); return makeAny( x );
} }
if (type.equals(::cppu::UnoType< Reference< lang::XServiceInfo > >::get())) if (type.equals(::cppu::UnoType<lang::XServiceInfo>::get()))
{ {
// return XServiceInfo interface // return XServiceInfo interface
Reference< lang::XServiceInfo > x( Reference< lang::XServiceInfo > x(
static_cast< lang::XServiceInfo * >( this ) ); static_cast< lang::XServiceInfo * >( this ) );
return makeAny( x ); return makeAny( x );
} }
if (type.equals(::cppu::UnoType< Reference< ::my_module::XSomething > >::get())) if (type.equals(::cppu::UnoType<my_module::XSomething>::get()))
{ {
// return sample interface // return sample interface
Reference< ::my_module::XSomething > x( Reference< ::my_module::XSomething > x(
@@ -166,9 +166,9 @@ Sequence< Type > MyService1Impl::getTypes()
throw (RuntimeException) throw (RuntimeException)
{ {
Sequence< Type > seq( 3 ); Sequence< Type > seq( 3 );
seq[ 0 ] = ::cppu::UnoType< Reference< lang::XTypeProvider > >::get(); seq[ 0 ] = ::cppu::UnoType<lang::XTypeProvider>::get();
seq[ 1 ] = ::cppu::UnoType< Reference< lang::XServiceInfo > >::get(); seq[ 1 ] = ::cppu::UnoType<lang::XServiceInfo>::get();
seq[ 2 ] = ::cppu::UnoType< Reference< ::my_module::XSomething > >::get(); seq[ 2 ] = ::cppu::UnoType<my_module::XSomething>::get();
return seq; return seq;
} }

6
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
View File

@@ -109,9 +109,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException)
{ {
OTypeCollection aTypes( OTypeCollection aTypes(
::cppu::UnoType< Reference< ::com::sun::star::beans::XMultiPropertySet > >::get(), ::cppu::UnoType<css::beans::XMultiPropertySet>::get(),
::cppu::UnoType< Reference< ::com::sun::star::beans::XFastPropertySet > >::get(), ::cppu::UnoType<css::beans::XFastPropertySet>::get(),
::cppu::UnoType< Reference< ::com::sun::star::beans::XPropertySet > >::get()); ::cppu::UnoType<css::beans::XPropertySet>::get());
return concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); return concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
} }

6
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
View File

@@ -110,9 +110,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException)
{ {
::cppu::OTypeCollection aTypes( ::cppu::OTypeCollection aTypes(
::cppu::UnoType< Reference< XMultiPropertySet > >::get(), ::cppu::UnoType<XMultiPropertySet>::get(),
::cppu::UnoType< Reference< XFastPropertySet > >::get(), ::cppu::UnoType<XFastPropertySet>::get(),
::cppu::UnoType< Reference< XPropertySet > >::get()); ::cppu::UnoType<XPropertySet>::get());
return concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); return concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
} }

10
sw/source/core/access/acctable.cxx
View File

@@ -851,17 +851,17 @@ uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType )
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
uno::Any aRet; uno::Any aRet;
if ( rType == cppu::UnoType< uno::Reference< XAccessibleTable > >::get() ) if ( rType == cppu::UnoType<XAccessibleTable>::get() )
{ {
uno::Reference<XAccessibleTable> xThis( this ); uno::Reference<XAccessibleTable> xThis( this );
aRet <<= xThis; aRet <<= xThis;
} }
else if ( rType == cppu::UnoType< uno::Reference< XAccessibleSelection > >::get() ) else if ( rType == cppu::UnoType<XAccessibleSelection>::get() )
{ {
uno::Reference<XAccessibleSelection> xSelection( this ); uno::Reference<XAccessibleSelection> xSelection( this );
aRet <<= xSelection; aRet <<= xSelection;
} }
else if ( rType == cppu::UnoType< uno::Reference<XAccessibleTableSelection> >::get() ) else if ( rType == cppu::UnoType<XAccessibleTableSelection>::get() )
{ {
uno::Reference<XAccessibleTableSelection> xTableExtent( this ); uno::Reference<XAccessibleTableSelection> xTableExtent( this );
aRet <<= xTableExtent; aRet <<= xTableExtent;
@@ -884,8 +884,8 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
aTypes.realloc( nIndex + 2 ); aTypes.realloc( nIndex + 2 );
uno::Type* pTypes = aTypes.getArray(); uno::Type* pTypes = aTypes.getArray();
pTypes[nIndex++] = cppu::UnoType< uno::Reference< XAccessibleSelection > >::get(); pTypes[nIndex++] = cppu::UnoType<XAccessibleSelection>::get();
pTypes[nIndex++] = cppu::UnoType< uno::Reference< XAccessibleTable > >::get(); pTypes[nIndex++] = cppu::UnoType<XAccessibleTable>::get();
return aTypes; return aTypes;
} }