Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I320895b73f101986e1aab95668c7b76e04315aab

4 files changed, 15 insertions, 15 deletions

diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index a7e914218eb5..d6e463c5ae3f 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -192,51 +192,51 @@ ________________________________________________________________________________
 //  help macros to replace TYPES in getTypes() [see before]
 
 #define PRIVATE_DEFINE_TYPE_1( TYPE1 )                                                                                                          \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE1 >*)NULL )
+    cppu::UnoType<TYPE1>::get()
 
 #define PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 )                                                                                                   \
     PRIVATE_DEFINE_TYPE_1( TYPE1 ),                                                                                                             \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE2 >*)NULL )
+    cppu::UnoType<TYPE2>::get()
 
 #define PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 )                                                                                            \
     PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ),                                                                                                      \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE3 >*)NULL )
+    cppu::UnoType<TYPE3>::get()
 
 #define PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 )                                                                                     \
     PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ),                                                                                               \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE4 >*)NULL )
+    cppu::UnoType<TYPE4>::get()
 
 #define PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 )                                                                              \
     PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ),                                                                                        \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE5 >*)NULL )
+    cppu::UnoType<TYPE5>::get()
 
 #define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 )                                                                       \
     PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ),                                                                                 \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE6 >*)NULL )
+    cppu::UnoType<TYPE6>::get()
 
 #define PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 )                                                                \
     PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ),                                                                          \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE7 >*)NULL )
+    cppu::UnoType<TYPE7>::get()
 
 #define PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 )                                                         \
     PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ),                                                                   \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE8 >*)NULL )
+    cppu::UnoType<TYPE8>::get()
 
 #define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 )                                                  \
     PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ),                                                            \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE9 >*)NULL )
+    cppu::UnoType<TYPE9>::get()
 
 #define PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 )                                         \
     PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ),                                                     \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE10 >*)NULL )
+    cppu::UnoType<TYPE10>::get()
 
 #define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 )                                 \
     PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ),                                            \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE11 >*)NULL )
+    cppu::UnoType<TYPE11>::get()
 
 #define PRIVATE_DEFINE_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 )                         \
     PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ),                                    \
-    ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL )
+    cppu::UnoType<TYPE12>::get()
 
 //  private
 //  complete implementation of XTypeProvider
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 00ec059a627b..f91729b7acac 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -75,7 +75,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4<
         virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
             throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
-            return ::getCppuType((com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*)0);
+            return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 1bbc3b25620e..5fde1b4a9618 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -76,7 +76,7 @@ class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun
         virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
             throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
-            return ::getCppuType((com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*)0);
+            return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 917340d43e3d..11490a7f5a29 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -98,7 +98,7 @@ class RootItemContainer :   private cppu::BaseMutex,
         virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
             throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
-            return ::getCppuType((com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*)0);
+            return cppu::UnoType<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()