Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I37d1a939c1a98f77152ed90dfb201446101f3157

44 files changed, 74 insertions, 85 deletions

diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
index a879fda6f881..8c2c0c061df9 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -473,7 +473,7 @@ void unoInterfaceProxyDispatch(
                         OUString("illegal member type description!"),
                         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-                Type const & rExcType = ::getCppuType( &aExc );
+                Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
                 // binary identical null reference
                 ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
         }
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index c4befc9026f6..d4ecf85dfbe9 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -325,7 +325,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges.ios", aRE.Message);
         return;
@@ -340,7 +340,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges.ios", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index a8f27b646305..29db017e350b 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -670,7 +670,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index fbe00fc5b1ef..78e38fea6d2d 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -542,7 +542,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
index 5034b0b87ebb..0231c468ec5a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx
@@ -469,7 +469,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
index 83055ac78d0e..4c04088016fc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
@@ -509,7 +509,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index bccc2ceb348f..53319a4d9581 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -305,7 +305,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (! header)
         {
             RuntimeException aRE( "no exception header!" );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
             return;
@@ -321,7 +321,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (0 == pExcTypeDescr)
         {
             RuntimeException aRE( OUString("exception type not found: ") + unoName );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
         }
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 8dfb88d9396d..8670f0d40801 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -719,7 +719,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 833a41548d18..14d37506d78f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -275,7 +275,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (! header)
         {
             RuntimeException aRE( "no exception header!" );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
             return;
@@ -292,7 +292,7 @@ namespace CPPU_CURRENT_NAMESPACE
         {
             RuntimeException aRE(
                 OUString("exception type not found: ") + unoName );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
         }
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index 3460b4f7b2ec..86958ad8f94a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -500,7 +500,7 @@ void unoInterfaceProxyDispatch(
                 OUString("illegal member type description!"),
                 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-            Type const & rExcType = ::getCppuType( &aExc );
+            Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
             // binary identical null reference
             ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
         }
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index eefe901dcd4d..a395a5dd8c17 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -667,7 +667,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index c36e1d9d2dfe..ba6fb5e6ac53 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -276,7 +276,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -292,7 +292,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( "exception type not found: " + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 8e714c1922c3..9191bb24e60a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -366,7 +366,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 176d4e0b5ec1..544e72e1e1fb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -275,7 +275,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (! header)
         {
             RuntimeException aRE( "no exception header!" );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
             return;
@@ -291,7 +291,7 @@ namespace CPPU_CURRENT_NAMESPACE
         if (0 == pExcTypeDescr)
         {
             RuntimeException aRE( OUString("exception type not found: ") + unoName );
-            Type const & rType = ::getCppuType( &aRE );
+            Type const & rType = cppu::UnoType<decltype(aRE)>::get();
             uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
             SAL_WARN("bridges", aRE.Message);
         }
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
index 6699e3cc6aca..b5b8606b46ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
@@ -471,7 +471,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 7f9cd88c4392..44ef70b7cb12 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -266,7 +266,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -282,7 +282,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index 87ccfb4849aa..ffcf083dcfe6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -575,7 +575,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
       }
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 9a34b982ca86..23a7ce4ad51e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -659,7 +659,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 342ab9cef0fa..401307642bc6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -644,7 +644,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index d4e981453a20..575e22dfd98e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -610,7 +610,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index 45429d0e3b09..ac6260c1caec 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -514,7 +514,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 5d3233e23f6e..720e4d617afb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -268,7 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -284,7 +284,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index f3e47965e6fd..5f105abdd0cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -580,7 +580,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 10530d8caea9..d03a6abf915e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -143,7 +143,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -159,7 +159,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( "exception type not found: " + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 4b4e935c2f98..b286d17a56d8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -450,7 +450,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 0fd9d6af1407..d79411070dad 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -329,7 +329,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -345,7 +345,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( "exception type not found: " + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index 1e3e11894de5..8b7ac55111ff 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -428,7 +428,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 6415c5b75639..7308f3e71adb 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -269,7 +269,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -285,7 +285,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index 4f829ad7798f..e031f7f877dd 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -328,7 +328,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 0e7bb8ad6502..472863acc114 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -266,7 +266,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -282,7 +282,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index 45cbc2f0b6c8..132e31dddabc 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -575,7 +575,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 4b4911991331..2798122f78f9 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -260,7 +260,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -276,7 +276,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index 573d51ee5d68..75c3a34dc61f 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -366,7 +366,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index 4b4911991331..2798122f78f9 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -260,7 +260,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (! header)
     {
         RuntimeException aRE( "no exception header!" );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
         return;
@@ -276,7 +276,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
     if (0 == pExcTypeDescr)
     {
         RuntimeException aRE( OUString("exception type not found: ") + unoName );
-        Type const & rType = ::getCppuType( &aRE );
+        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
         uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
         SAL_WARN("bridges", aRE.Message);
     }
diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
index d437817b3743..9706f0cc2d04 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
@@ -426,7 +426,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 6c4596e016c2..bcf95af9bc64 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -536,7 +536,7 @@ int msci_filterCppException(
                     RuntimeException exc( buf.makeStringAndClear() );
                     uno_type_any_constructAndConvert(
                         pUnoExc, &exc,
-                        ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+                        cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno );
                     // msvcr80.dll cleans up, different from former msvcrs
                     // if (! rethrow):
                     // though this unknown exception leaks now, no user-defined
@@ -561,7 +561,7 @@ int msci_filterCppException(
     RuntimeException exc( "[msci_uno bridge error] unexpected "
                   "C++ exception occurred!" );
     uno_type_any_constructAndConvert(
-        pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+        pUnoExc, &exc, cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno );
     return EXCEPTION_EXECUTE_HANDLER;
 }
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index 53730f210fab..f1007dd55aec 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -442,7 +442,7 @@ void unoInterfaceProxyDispatch(
             OUString("illegal member type description!"),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index a11e9c92fa0d..f95a04589987 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -937,7 +937,7 @@ int mscx_filterCppException(
                     RuntimeException exc( buf.makeStringAndClear() );
                     uno_type_any_constructAndConvert(
                         pUnoExc, &exc,
-                        ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+                        cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno );
                 }
                 else
                 {
@@ -957,7 +957,7 @@ int mscx_filterCppException(
     RuntimeException exc( "[mscx_uno bridge error] unexpected "
                   "C++ exception occurred!" );
     uno_type_any_constructAndConvert(
-        pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
+        pUnoExc, &exc, cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno );
     return EXCEPTION_EXECUTE_HANDLER;
 }
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 6befd6313941..35ca9ebd22e6 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -412,7 +412,7 @@ void unoInterfaceProxyDispatch(
             {
                 RuntimeException aExc( "Too many parameters!" );
 
-                Type const & rExcType = ::getCppuType( &aExc );
+                Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
                 ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
             }
         }
@@ -422,7 +422,7 @@ void unoInterfaceProxyDispatch(
     {
         RuntimeException aExc( "Illegal member type description!" );
 
-        Type const & rExcType = ::getCppuType( &aExc );
+        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
         // Binary identical null reference (whatever that comment means...)
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
     }
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 13b8c6b84fb5..d4b95be6b442 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -485,13 +485,11 @@ JNI_info::JNI_info(
       m_XInterface_queryInterface_td(
         (reinterpret_cast< typelib_InterfaceTypeDescription * >(
             css::uno::TypeDescription(
-                ::getCppuType(
-                    (css::uno::Reference< css::uno::XInterface > const *)0 ) )
+                cppu::UnoType<css::uno::XInterface>::get())
             .get())->ppMembers[ 0 ] ) ),
-      m_Exception_type( ::getCppuType( (css::uno::Exception const *)0 ) ),
-      m_RuntimeException_type(
-          ::getCppuType( (css::uno::RuntimeException const *)0 ) ),
-      m_void_type( ::getCppuVoidType() ),
+      m_Exception_type(cppu::UnoType<css::uno::Exception>::get()),
+      m_RuntimeException_type(cppu::UnoType<css::uno::RuntimeException>::get()),
+      m_void_type(cppu::UnoType<cppu::UnoVoidType>::get()),
       m_XInterface_type_info( 0 )
 {
     JNI_context jni( this, jni_env, class_loader ); // !no proper jni_info!
@@ -864,8 +862,7 @@ JNI_info::JNI_info(
     try
     {
         css::uno::TypeDescription XInterface_td(
-            ::getCppuType(
-                (css::uno::Reference< css::uno::XInterface > const *)0 ) );
+            cppu::UnoType<css::uno::XInterface>::get());
         // coverity [ctor_dtor_leak]
         m_XInterface_type_info =
             new JNI_interface_type_info( jni, XInterface_td.get() );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 88497b562652..27df64dd30f2 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -794,7 +794,7 @@ void SAL_CALL UNO_proxy_dispatch(
             buf.makeStringAndClear(),
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
-        ::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc );
+        ::com::sun::star::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
         uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0 );
         SAL_INFO("bridges", exc.Message);
     }
@@ -805,7 +805,7 @@ void SAL_CALL UNO_proxy_dispatch(
             "[jni_uno bridge error] attaching current thread to java failed!",
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
-        ::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc );
+        ::com::sun::star::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
         uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0 );
         SAL_WARN("bridges", exc.Message);
     }
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index 2f943f9d13e1..380abf4f5ecd 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -56,8 +56,8 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_cr
     SAL_THROW_EXTERN_C()
 {
     // publish some idl types
-    ::getCppuType( (Reference< XTransport > const *)0 );
-    ::getCppuType( (Reference< ::test::java_uno::anytest::DerivedInterface > const *)0 );
+    cppu::UnoType< XTransport >::get();
+    cppu::UnoType<test::java_uno::anytest::DerivedInterface>::get();
 
     Reference< XTransport > xRet( new Transport() );
 
@@ -87,7 +87,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_cr
     // map interface
     Mapping mapping( cpp_env.get(), java_env.get() );
     OSL_ASSERT( mapping.is() );
-    jobject jo_global = (jobject)mapping.mapInterface( xRet.get(), ::getCppuType( &xRet ) );
+    jobject jo_global = (jobject)mapping.mapInterface( xRet.get(), cppu::UnoType<decltype(xRet)>::get() );
     OSL_ASSERT( 0 != jo_global );
 
     // return
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 407872948664..34ca8c0d9d82 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -130,16 +130,9 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
     throw (css::uno::Exception)
 {
     // Make types known:
-    getCppuType(
-        static_cast<
-        css::uno::Reference< test::java_uno::equals::XBase > const * >(0));
-    getCppuType(
-        static_cast<
-        css::uno::Reference< test::java_uno::equals::XDerived > const * >(0));
-    getCppuType(
-        static_cast<
-        css::uno::Reference< test::java_uno::equals::XTestInterface > const * >(
-            0));
+    cppu::UnoType<test::java_uno::equals::XBase>::get();
+    cppu::UnoType<test::java_uno::equals::XDerived>::get();
+    cppu::UnoType<test::java_uno::equals::XTestInterface>::get();
 
     return static_cast< cppu::OWeakObject * >(new Service(rContext));
 }
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index ebf097197c6b..376dab71f6f9 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -122,20 +122,20 @@ public:
     {
         // execution time remains appr. constant any time
         Any aRet;
-        if (aType == ::getCppuType( (const Reference< XInterface > *)0 ))
+        if (aType == cppu::UnoType<XInterface>::get())
         {
             void * p = (XInterface *)(XPerformanceTest *)this;
-            aRet.setValue( &p, ::getCppuType( (const Reference< XInterface > *)0 ) );
+            aRet.setValue( &p, cppu::UnoType<XInterface>::get() );
         }
-        if (aType == ::getCppuType( (const Reference< XPerformanceTest > *)0 ))
+        if (aType == cppu::UnoType<XPerformanceTest>::get())
         {
             void * p = (XPerformanceTest *)this;
-            aRet.setValue( &p, ::getCppuType( (const Reference< XPerformanceTest > *)0 ) );
+            aRet.setValue( &p, cppu::UnoType<XPerformanceTest>::get() );
         }
         if (! aRet.hasValue())
         {
             void * p = (XPerformanceTest *)this;
-            Any aDummy( &p, ::getCppuType( (const Reference< XPerformanceTest > *)0 ) );
+            Any aDummy( &p, cppu::UnoType<XPerformanceTest>::get() );
         }
         return aRet;
     }
@@ -615,8 +615,7 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe )
 
 void testRemote( const Reference< XInterface > &rRemote )
 {
-    char a;
-      getCppuType( (sal_Int8*)&a );
+    cppu::UnoType<sal_Int8>::get();
 
     Reference< XTestFactory > rRFact( rRemote , UNO_QUERY );
     if( ! rRFact.is() )