diff options
-rw-r--r-- | comphelper/source/container/IndexedPropertyValuesContainer.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/container/NamedPropertyValuesContainer.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/misc/proxyaggregation.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/misc/types.cxx | 2 | ||||
-rw-r--r-- | include/comphelper/property.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/types.hxx | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 1df9a1e9e778..9c54c3375b45 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -205,7 +205,7 @@ sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) ::com::sun::star::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) 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( ) diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index c94efa68a002..d59944a81329 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -176,7 +176,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ::com::sun::star::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) 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( ) diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 6a6739433cc1..1bcf8ef40d41 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -54,7 +54,7 @@ namespace comphelper m_xProxyAggregate = xFactory->createProxy( _rxComponent ); } 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 osl_atomic_increment( &_rRefCount ); diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 4d9a074a9a34..8cf8becd68a1 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -122,7 +122,7 @@ OUString getString(const Any& _rAny) bool getBOOL(const Any& _rAny) { bool nReturn = false; - if (_rAny.getValueType() == ::getCppuBooleanType()) + if (_rAny.getValueType() == cppu::UnoType<bool>::get()) nReturn = *static_cast<sal_Bool const *>(_rAny.getValue()); else OSL_FAIL("comphelper::getBOOL : invalid argument !"); diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index 7be8761fb128..b45c3f0470d8 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -153,8 +153,8 @@ inline bool tryPropertyValue(css::uno::Any& /*out*/_rConvertedValue, css::uno::A ::cppu::convertPropertyValue(bNewValue, _rValueToSet); if (bool(bNewValue) != _bCurrentValue) { - _rConvertedValue.setValue(&bNewValue, ::getBooleanCppuType()); - _rOldValue.setValue(&_bCurrentValue, ::getBooleanCppuType()); + _rConvertedValue.setValue(&bNewValue, cppu::UnoType<bool>::get()); + _rOldValue.setValue(&_bCurrentValue, cppu::UnoType<bool>::get()); bModified = true; } return bModified; diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 355daf2d71b3..4ffb6c81b307 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -154,11 +154,11 @@ namespace comphelper //= replacement of some former UsrAny.setXXX methods - can be used with rvalues inline void setBOOL(css::uno::Any& _rAny, bool _b) - { _rAny.setValue(&_b, ::getBooleanCppuType()); } + { _rAny.setValue(&_b, cppu::UnoType<bool>::get()); } //= extension of ::cppu::makeAny() inline css::uno::Any makeBoolAny(bool _b) - { return css::uno::Any(&_b, ::getBooleanCppuType()); } + { return css::uno::Any(&_b, cppu::UnoType<bool>::get()); } } // namespace comphelper |