Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part13

Change-Id: Ieecfd7ccb10c75ac639d0ba8e7cb588607097c2a

17 files changed, 63 insertions, 63 deletions

diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index b64cdfdeb584..e989da30f8ff 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@@ -44,8 +44,8 @@ IMPL_XUNOTUNNEL( VCLXBitmap )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXBitmap )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XBitmap>::get(),
+    cppu::UnoType<com::sun::star::awt::XDisplayBitmap>::get()
 IMPL_XTYPEPROVIDER_END
 
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 90bc1266f9f2..45b5e20b3f3f 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -57,8 +57,8 @@ VCLXContainer::~VCLXContainer()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXContainer )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainer>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerPeer>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XVclContainer>::get(),
+    cppu::UnoType<com::sun::star::awt::XVclContainerPeer>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index f9b1c4f3a383..ce0e3de429ca 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -82,8 +82,8 @@ IMPL_XUNOTUNNEL( VCLXDevice )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXDevice )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnitConversion>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XDevice>::get(),
+    cppu::UnoType<com::sun::star::awt::XUnitConversion>::get()
 IMPL_XTYPEPROVIDER_END
 
 
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 06a440b24b09..14174f25b5d7 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -84,7 +84,7 @@ IMPL_XUNOTUNNEL( VCLXFont )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXFont )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont2>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XFont2>::get()
 IMPL_XTYPEPROVIDER_END
 
 
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 82efe1620adf..6a3a479a44dc 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -53,7 +53,7 @@ IMPL_XUNOTUNNEL( VCLXGraphics )
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXGraphics )
-    getCppuType( ( uno::Reference< awt::XGraphics>* ) NULL )
+    cppu::UnoType<awt::XGraphics>::get()
 IMPL_XTYPEPROVIDER_END
 
 VCLXGraphics::VCLXGraphics()
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 97ccd04ef2ad..7a691e3b4434 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -250,10 +250,10 @@ throw(css::uno::RuntimeException, std::exception)
             if( !pCollectionPopupMenu )
             {
                 static ::cppu::OTypeCollection collectionPopupMenu(
-                getCppuType( ( css::uno::Reference< css::lang::XTypeProvider>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::awt::XMenu>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::awt::XPopupMenu>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::lang::XServiceInfo>* ) NULL ) );
+                cppu::UnoType<css::lang::XTypeProvider>::get(),
+                cppu::UnoType<css::awt::XMenu>::get(),
+                cppu::UnoType<css::awt::XPopupMenu>::get(),
+                cppu::UnoType<css::lang::XServiceInfo>::get());
                 pCollectionPopupMenu = &collectionPopupMenu;
             }
         }
@@ -268,10 +268,10 @@ throw(css::uno::RuntimeException, std::exception)
             if( !pCollectionMenuBar )
             {
                 static ::cppu::OTypeCollection collectionMenuBar(
-                getCppuType( ( css::uno::Reference< css::lang::XTypeProvider>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::awt::XMenu>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::awt::XMenuBar>* ) NULL ),
-                getCppuType( ( css::uno::Reference< css::lang::XServiceInfo>* ) NULL ) );
+                cppu::UnoType<css::lang::XTypeProvider>::get(),
+                cppu::UnoType<css::awt::XMenu>::get(),
+                cppu::UnoType<css::awt::XMenuBar>::get(),
+                cppu::UnoType<css::lang::XServiceInfo>::get());
                 pCollectionMenuBar = &collectionMenuBar;
             }
         }
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index faa7f9a1d629..7a3df1e50ece 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -48,7 +48,7 @@ IMPL_XUNOTUNNEL( VCLXPointer )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXPointer )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XPointer>::get()
 IMPL_XTYPEPROVIDER_END
 
 void VCLXPointer::setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 14677c51a104..206201f40a44 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -49,7 +49,7 @@
         {
             static ::com::sun::star::beans::Property aPropTable[] =
             {
-                ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
+                ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ),
                 ::com::sun::star::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
             };
             pProperties = aPropTable;
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 8ac1dce7edeb..ae777e654592 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.cxx
@@ -51,7 +51,7 @@ IMPL_XUNOTUNNEL( VCLXRegion )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXRegion )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XRegion>::get()
 IMPL_XTYPEPROVIDER_END
 
 
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 05dc3856287e..17b1877f73ff 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -58,7 +58,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXSystemDependentWindow )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSystemDependentWindowPeer>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XSystemDependentWindowPeer>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index cb174ffe1fe9..78637d42adcd 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -795,8 +795,8 @@ VCLXCheckBox::VCLXCheckBox() :  maActionListeners( *this ), maItemListeners( *th
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXCheckBox )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XButton>::get(),
+    cppu::UnoType<com::sun::star::awt::XCheckBox>::get(),
     VCLXGraphicControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -1096,8 +1096,8 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXRadioButton )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRadioButton>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XRadioButton>::get(),
+    cppu::UnoType<com::sun::star::awt::XButton>::get(),
     VCLXGraphicControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -1356,7 +1356,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXSpinField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XSpinField>::get(),
     VCLXEdit::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -2201,7 +2201,7 @@ VCLXMessageBox::~VCLXMessageBox()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXMessageBox )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XMessageBox>::get(),
     VCLXTopWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -2288,8 +2288,8 @@ VCLXDialog::~VCLXDialog()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXDialog )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog2>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XDialog2>::get(),
+    cppu::UnoType<com::sun::star::awt::XDialog>::get(),
     VCLXTopWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -2899,7 +2899,7 @@ void VCLXFixedHyperlink::dispose() throw(::com::sun::star::uno::RuntimeException
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXFixedHyperlink )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedHyperlink>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XFixedHyperlink>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3203,7 +3203,7 @@ VCLXFixedText::~VCLXFixedText()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXFixedText )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XFixedText>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3345,7 +3345,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXScrollBar )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XScrollBar>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XScrollBar>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3831,9 +3831,9 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this )
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXEdit )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextEditField>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextLayoutConstrains>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XTextComponent>::get(),
+    cppu::UnoType<com::sun::star::awt::XTextEditField>::get(),
+    cppu::UnoType<com::sun::star::awt::XTextLayoutConstrains>::get(),
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -4819,7 +4819,7 @@ VCLXDateField::~VCLXDateField()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXDateField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDateField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XDateField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -5167,7 +5167,7 @@ VCLXTimeField::~VCLXTimeField()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXTimeField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTimeField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XTimeField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -5466,7 +5466,7 @@ VCLXNumericField::~VCLXNumericField()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXNumericField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XNumericField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XNumericField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -5823,7 +5823,7 @@ MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::Runt
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXMetricField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMetricField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XMetricField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -6062,7 +6062,7 @@ VCLXCurrencyField::~VCLXCurrencyField()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXCurrencyField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCurrencyField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XCurrencyField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -6411,7 +6411,7 @@ VCLXPatternField::~VCLXPatternField()
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( VCLXPatternField )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPatternField>* ) NULL ),
+    cppu::UnoType<com::sun::star::awt::XPatternField>::get(),
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 7c01058b290a..0faf34fb3bfc 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -763,8 +763,8 @@ void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListe
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoMultiPageControl )
-    getCppuType( ( uno::Reference< awt::XSimpleTabController>* ) NULL ),
-    getCppuType( ( uno::Reference< awt::XTabListener>* ) NULL ),
+    cppu::UnoType<awt::XSimpleTabController>::get(),
+    cppu::UnoType<awt::XTabListener>::get(),
     ControlContainerBase::getTypes()
 IMPL_XTYPEPROVIDER_END
 
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index 4c8c35561835..f90e18c52e0b 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -188,7 +188,7 @@ void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::R
 
 // Ctor
 ScriptEventContainer::ScriptEventContainer( void )
-    : NameContainer_Impl( getCppuType( (ScriptEventDescriptor*) NULL ) )
+    : NameContainer_Impl( cppu::UnoType<ScriptEventDescriptor>::get())
 {
 }
 
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 5c58e5c43dfa..d61e723f4afe 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -224,9 +224,9 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star
 
 // ::com::sun::star::lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( StdTabControllerModel )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>* ) NULL )
+    cppu::UnoType<com::sun::star::awt::XTabControllerModel>::get(),
+    cppu::UnoType<com::sun::star::lang::XServiceInfo>::get(),
+    cppu::UnoType<com::sun::star::io::XPersistObject>::get()
 IMPL_XTYPEPROVIDER_END
 
 sal_Bool StdTabControllerModel::getGroupControl(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index f0b627e15e6d..04d8c5bde437 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -107,8 +107,8 @@ namespace toolkit
 
     // ::com::sun::star::lang::XTypeProvider
     IMPL_XTYPEPROVIDER_START( UnoScrollBarControl )
-        getCppuType( ( uno::Reference< awt::XAdjustmentListener>* ) NULL ),
-        getCppuType( ( uno::Reference< awt::XScrollBar>* ) NULL ),
+        cppu::UnoType<awt::XAdjustmentListener>::get(),
+        cppu::UnoType<awt::XScrollBar>::get(),
         UnoControlBase::getTypes()
     IMPL_XTYPEPROVIDER_END
 
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index f3c85ef16def..c9ada6b734a1 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -611,7 +611,7 @@ void UnoControlContainer::addingControl( const uno::Reference< awt::XControl >&
     if ( _rxControl.is() )
     {
         uno::Reference< uno::XInterface > xThis;
-        OWeakAggObject::queryInterface( ::getCppuType( static_cast< uno::Reference< uno::XInterface >* >( NULL ) ) ) >>= xThis;
+        OWeakAggObject::queryInterface( cppu::UnoType<uno::XInterface>::get() ) >>= xThis;
 
         _rxControl->setContext( xThis );
         _rxControl->addEventListener( this );
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 38598c0ed177..3f759dbf3c4a 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -1533,8 +1533,8 @@ uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) t
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoFixedHyperlinkControl )
-    getCppuType( ( uno::Reference< awt::XFixedHyperlink>* ) NULL ),
-    getCppuType( ( uno::Reference< awt::XLayoutConstrains>* ) NULL ),
+    cppu::UnoType<awt::XFixedHyperlink>::get(),
+    cppu::UnoType<awt::XLayoutConstrains>::get(),
     UnoControlBase::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -1729,8 +1729,8 @@ uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoFixedTextControl )
-    getCppuType( ( uno::Reference< awt::XFixedText>* ) NULL ),
-    getCppuType( ( uno::Reference< awt::XLayoutConstrains>* ) NULL ),
+    cppu::UnoType<awt::XFixedText>::get(),
+    cppu::UnoType<awt::XLayoutConstrains>::get(),
     UnoControlBase::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -2994,9 +2994,9 @@ uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(u
 }
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoComboBoxControl )
-    getCppuType( ( uno::Reference< awt::XComboBox>* ) NULL ),
-    getCppuType( ( uno::Reference< awt::XItemListener>* ) NULL ),
-    getCppuType( ( uno::Reference< awt::XItemListListener>* ) NULL ),
+    cppu::UnoType<awt::XComboBox>::get(),
+    cppu::UnoType<awt::XItemListener>::get(),
+    cppu::UnoType<awt::XItemListListener>::get(),
     UnoEditControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3291,7 +3291,7 @@ uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoSpinFieldControl )
-    getCppuType( ( uno::Reference< awt::XSpinField>* ) NULL ),
+    cppu::UnoType<awt::XSpinField>::get(),
     UnoEditControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3441,7 +3441,7 @@ uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoDateFieldControl )
-    getCppuType( ( uno::Reference< awt::XDateField>* ) NULL ),
+    cppu::UnoType<awt::XDateField>::get(),
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3696,7 +3696,7 @@ uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoTimeFieldControl )
-    getCppuType( ( uno::Reference< awt::XTimeField>* ) NULL ),
+    cppu::UnoType<awt::XTimeField>::get(),
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -3911,7 +3911,7 @@ uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) thr
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoNumericFieldControl )
-    getCppuType( ( uno::Reference< awt::XNumericField>* ) NULL ),
+    cppu::UnoType<awt::XNumericField>::get(),
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -4129,7 +4129,7 @@ uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) th
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoCurrencyFieldControl )
-    getCppuType( ( uno::Reference< awt::XCurrencyField>* ) NULL ),
+    cppu::UnoType<awt::XCurrencyField>::get(),
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -4362,7 +4362,7 @@ uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) thr
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl )
-    getCppuType( ( uno::Reference< awt::XPatternField>* ) NULL ),
+    cppu::UnoType<awt::XPatternField>::get(),
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
@@ -4498,7 +4498,7 @@ uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) thro
 
 // lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoProgressBarControl )
-    getCppuType( ( uno::Reference< awt::XProgressBar>* ) NULL ),
+    cppu::UnoType<awt::XProgressBar>::get(),
     UnoControlBase::getTypes()
 IMPL_XTYPEPROVIDER_END