diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 10:42:11 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 10:42:57 +0200 |
commit | 31e24f487e5a4e917bb35fd396cf9f3ad84982a8 (patch) | |
tree | 6e4cbfcd49a8fed02847b8c7719759e09260cf7c /odk | |
parent | 3e672693e35e720177eac98094c42570fca9cfbb (diff) |
Remove redundant Reference<> from within UnoType<> uses
Change-Id: I1aeb9c73c284e39f371e49ded98e8dba0d055056
Diffstat (limited to 'odk')
3 files changed, 13 insertions, 13 deletions
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 20649fc16579..b9cf6f17b49b 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -111,7 +111,7 @@ public: Any MyService1Impl::queryInterface( Type const & type ) throw (RuntimeException) { - if (type.equals(::cppu::UnoType< Reference< XInterface > >::get())) + if (type.equals(::cppu::UnoType<XInterface>::get())) { // return XInterface interface // (resolve ambiguity by casting to lang::XTypeProvider) @@ -119,21 +119,21 @@ Any MyService1Impl::queryInterface( Type const & type ) static_cast< lang::XTypeProvider * >( this ) ); return makeAny( x ); } - if (type.equals(::cppu::UnoType< Reference< lang::XTypeProvider > >::get())) + if (type.equals(::cppu::UnoType<lang::XTypeProvider>::get())) { // return XInterface interface Reference< XInterface > x( static_cast< lang::XTypeProvider * >( this ) ); return makeAny( x ); } - if (type.equals(::cppu::UnoType< Reference< lang::XServiceInfo > >::get())) + if (type.equals(::cppu::UnoType<lang::XServiceInfo>::get())) { // return XServiceInfo interface Reference< lang::XServiceInfo > x( static_cast< lang::XServiceInfo * >( this ) ); 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 Reference< ::my_module::XSomething > x( @@ -166,9 +166,9 @@ Sequence< Type > MyService1Impl::getTypes() throw (RuntimeException) { Sequence< Type > seq( 3 ); - seq[ 0 ] = ::cppu::UnoType< Reference< lang::XTypeProvider > >::get(); - seq[ 1 ] = ::cppu::UnoType< Reference< lang::XServiceInfo > >::get(); - seq[ 2 ] = ::cppu::UnoType< Reference< ::my_module::XSomething > >::get(); + seq[ 0 ] = ::cppu::UnoType<lang::XTypeProvider>::get(); + seq[ 1 ] = ::cppu::UnoType<lang::XServiceInfo>::get(); + seq[ 2 ] = ::cppu::UnoType<my_module::XSomething>::get(); return seq; } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index 86f103e12b3e..c4847fe50db7 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -109,9 +109,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) { OTypeCollection aTypes( - ::cppu::UnoType< Reference< ::com::sun::star::beans::XMultiPropertySet > >::get(), - ::cppu::UnoType< Reference< ::com::sun::star::beans::XFastPropertySet > >::get(), - ::cppu::UnoType< Reference< ::com::sun::star::beans::XPropertySet > >::get()); + ::cppu::UnoType<css::beans::XMultiPropertySet>::get(), + ::cppu::UnoType<css::beans::XFastPropertySet>::get(), + ::cppu::UnoType<css::beans::XPropertySet>::get()); return concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index f3b1b59b3b86..bc84cc43c9d5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -110,9 +110,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) { ::cppu::OTypeCollection aTypes( - ::cppu::UnoType< Reference< XMultiPropertySet > >::get(), - ::cppu::UnoType< Reference< XFastPropertySet > >::get(), - ::cppu::UnoType< Reference< XPropertySet > >::get()); + ::cppu::UnoType<XMultiPropertySet>::get(), + ::cppu::UnoType<XFastPropertySet>::get(), + ::cppu::UnoType<XPropertySet>::get()); return concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } |