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

Replace remaining getCppuType et al with cppu::UnoType

Browse Source 
Change-Id: I8dd0e5c8837fe1615aa9d5f546c2fd1c0985f044
This commit is contained in:
Stephan Bergmann
2015-04-01 08:36:11 +02:00
parent 916f88f085
commit a88a386c72
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/source/container/IndexedPropertyValuesContainer.cxx
View File

@@ -205,7 +205,7 @@ sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( )
::com::sun::star::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) ::com::sun::star::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( )
throw(::com::sun::star::uno::RuntimeException, std::exception) throw(::com::sun::star::uno::RuntimeException, std::exception)
{ {
return ::getCppuType((uno::Sequence<beans::PropertyValue> *)0); return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
} }
sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( )

2
comphelper/source/container/NamedPropertyValuesContainer.cxx
View File

@@ -176,7 +176,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName
::com::sun::star::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) ::com::sun::star::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( )
throw(::com::sun::star::uno::RuntimeException, std::exception) throw(::com::sun::star::uno::RuntimeException, std::exception)
{ {
return ::getCppuType((uno::Sequence<beans::PropertyValue> *)0); return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
} }
sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( )

2
comphelper/source/misc/proxyaggregation.cxx
View File

@@ -54,7 +54,7 @@ namespace comphelper
m_xProxyAggregate = xFactory->createProxy( _rxComponent ); m_xProxyAggregate = xFactory->createProxy( _rxComponent );
} }
if ( m_xProxyAggregate.is() ) if ( m_xProxyAggregate.is() )
m_xProxyAggregate->queryAggregation( ::getCppuType( &m_xProxyTypeAccess ) ) >>= m_xProxyTypeAccess; m_xProxyAggregate->queryAggregation( cppu::UnoType<decltype(m_xProxyTypeAccess)>::get() ) >>= m_xProxyTypeAccess;
// aggregate the proxy // aggregate the proxy
osl_atomic_increment( &_rRefCount ); osl_atomic_increment( &_rRefCount );

2
comphelper/source/misc/types.cxx
View File

@@ -122,7 +122,7 @@ OUString getString(const Any& _rAny)
bool getBOOL(const Any& _rAny) bool getBOOL(const Any& _rAny)
{ {
bool nReturn = false; bool nReturn = false;
if (_rAny.getValueType() == ::getCppuBooleanType()) if (_rAny.getValueType() == cppu::UnoType<bool>::get())
nReturn = *static_cast<sal_Bool const *>(_rAny.getValue()); nReturn = *static_cast<sal_Bool const *>(_rAny.getValue());
else else
OSL_FAIL("comphelper::getBOOL : invalid argument !"); OSL_FAIL("comphelper::getBOOL : invalid argument !");

4
include/comphelper/property.hxx
View File

@@ -153,8 +153,8 @@ inline bool tryPropertyValue(css::uno::Any& /*out*/_rConvertedValue, css::uno::A
::cppu::convertPropertyValue(bNewValue, _rValueToSet); ::cppu::convertPropertyValue(bNewValue, _rValueToSet);
if (bool(bNewValue) != _bCurrentValue) if (bool(bNewValue) != _bCurrentValue)
{ {
_rConvertedValue.setValue(&bNewValue, ::getBooleanCppuType()); _rConvertedValue.setValue(&bNewValue, cppu::UnoType<bool>::get());
_rOldValue.setValue(&_bCurrentValue, ::getBooleanCppuType()); _rOldValue.setValue(&_bCurrentValue, cppu::UnoType<bool>::get());
bModified = true; bModified = true;
} }
return bModified; return bModified;

4
include/comphelper/types.hxx
View File

@@ -154,11 +154,11 @@ namespace comphelper
//= replacement of some former UsrAny.setXXX methods - can be used with rvalues //= replacement of some former UsrAny.setXXX methods - can be used with rvalues
inline void setBOOL(css::uno::Any& _rAny, bool _b) inline void setBOOL(css::uno::Any& _rAny, bool _b)
{ _rAny.setValue(&_b, ::getBooleanCppuType()); } { _rAny.setValue(&_b, cppu::UnoType<bool>::get()); }
//= extension of ::cppu::makeAny() //= extension of ::cppu::makeAny()
inline css::uno::Any makeBoolAny(bool _b) inline css::uno::Any makeBoolAny(bool _b)
{ return css::uno::Any(&_b, ::getBooleanCppuType()); } { return css::uno::Any(&_b, cppu::UnoType<bool>::get()); }
} // namespace comphelper } // namespace comphelper