From a88a386c724d13f73c33768e9a78efd95f522a89 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 1 Apr 2015 08:36:11 +0200
Subject: Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I8dd0e5c8837fe1615aa9d5f546c2fd1c0985f044
---
 comphelper/source/container/IndexedPropertyValuesContainer.cxx | 2 +-
 comphelper/source/container/NamedPropertyValuesContainer.cxx   | 2 +-
 comphelper/source/misc/proxyaggregation.cxx                    | 2 +-
 comphelper/source/misc/types.cxx                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'comphelper')

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 !");
-- 
cgit