6 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index fe33e1ea40c1..d197fb14a9a9 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -476,7 +476,7 @@ void ControlModelContainerBase::removeContainerListener( const Reference< XConta
 // XElementAcces
 Type ControlModelContainerBase::getElementType() throw(RuntimeException, std::exception)
 {
-    Type aType = getCppuType( ( Reference< XControlModel>* ) NULL );
+    Type aType = cppu::UnoType<XControlModel>::get();
     return aType;
 }
 
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 18f470a6240a..43d410faa9a0 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -247,7 +247,7 @@
     Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception)
     {
         Any aReturn;
-        if (_rType.equals(::getCppuType(static_cast< Reference< XCloneable>* >(NULL))) && !m_bCloneable)
+        if (_rType.equals(cppu::UnoType<XCloneable>::get()) && !m_bCloneable)
             // somebody is asking for the XCloneable interface, but our aggregate does not support it
             // -> outta here
             // (need this extra check, cause OGCM_Base::queryAggregation would return this interface
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index f326c7cf8c55..ab0c4467d139 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -332,7 +332,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException, std::exception)
     {
-        Type aType = getCppuType( ( Reference< XPropertySet>* ) NULL );
+        Type aType = cppu::UnoType<XPropertySet>::get();
         return aType;
     }
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 273d9173f25e..812ffef5ae15 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -169,8 +169,8 @@ Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeExcept
 
 // XTypeProvider
 IMPL_XTYPEPROVIDER_START( StdTabController )
-    getCppuType( ( Reference< XTabController>* ) NULL ),
-    getCppuType( ( Reference< XServiceInfo>* ) NULL )
+    cppu::UnoType<XTabController>::get(),
+    cppu::UnoType<XServiceInfo>::get()
 IMPL_XTYPEPROVIDER_END
 
 void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException, std::exception)
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index f841478eef85..d6878c17cc05 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -196,7 +196,7 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde
 // XElementAccess
 uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType(  ) throw (uno::RuntimeException, std::exception)
 {
-    return ::getCppuType(static_cast<  Reference< com::sun::star::awt::XControlModel>* >(NULL));
+    return cppu::UnoType<com::sun::star::awt::XControlModel>::get();
 }
 
 sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements(  ) throw (uno::RuntimeException, std::exception)
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index cb8b7a5df7b9..9437258714b5 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1098,7 +1098,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
             // kein TopWindow
             if ( !xToolkit.is() )
                 xToolkit = rParentPeer->getToolkit();
-            Any aAny = OWeakAggObject::queryInterface( ::getCppuType((const Reference< XControlContainer>*)0) );
+            Any aAny = OWeakAggObject::queryInterface( cppu::UnoType<XControlContainer>::get());
             Reference< XControlContainer > xC;
             aAny >>= xC;
             if( xC.is() )