[Libreoffice-commits] core.git: filter/source forms/source fpicker/source framework/inc framework/source helpcontent2 io/test javaunohelper/source linguistic/source mysqlc/source oox/source package/source pyuno/source reportdesign/source sdext/source sot/source starmath/source stoc/source stoc/test svl/source sw/source toolkit/source ucbhelper/source ucb/source UnoControls/source unotools/source vbahelper/source winaccessibility/source xmlscript/source

Julien Nabet serval2412 at yahoo.fr
Fri May 23 13:12:30 PDT 2014


 UnoControls/source/base/basecontainercontrol.cxx                   |    8 
 UnoControls/source/base/basecontrol.cxx                            |   36 +-
 UnoControls/source/base/multiplexer.cxx                            |   28 +-
 UnoControls/source/controls/framecontrol.cxx                       |   18 -
 UnoControls/source/controls/progressbar.cxx                        |    4 
 UnoControls/source/controls/progressmonitor.cxx                    |    6 
 UnoControls/source/controls/statusindicator.cxx                    |    4 
 filter/source/graphicfilter/icgm/actimpr.cxx                       |   20 -
 filter/source/msfilter/escherex.cxx                                |    6 
 filter/source/msfilter/msocximex.cxx                               |    2 
 filter/source/msfilter/svdfppt.cxx                                 |    3 
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx                |    4 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx              |   24 -
 forms/source/component/Button.cxx                                  |    2 
 forms/source/component/Columns.cxx                                 |   14 -
 forms/source/component/Edit.cxx                                    |    2 
 forms/source/component/EditBase.cxx                                |   10 
 forms/source/component/FormComponent.cxx                           |    8 
 forms/source/component/FormattedFieldWrapper.cxx                   |    6 
 forms/source/component/Grid.cxx                                    |   10 
 forms/source/component/ImageControl.cxx                            |    2 
 forms/source/component/clickableimage.cxx                          |    2 
 forms/source/component/refvaluecomponent.cxx                       |    2 
 forms/source/richtext/richtextunowrapper.cxx                       |    4 
 forms/source/xforms/datatyperepository.cxx                         |    2 
 forms/source/xforms/datatypes.hxx                                  |    2 
 fpicker/source/win32/filepicker/FilePicker.cxx                     |    2 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx    |    6 
 fpicker/source/win32/filepicker/asynceventnotifier.cxx             |    2 
 fpicker/source/win32/filepicker/workbench/Test_fps.cxx             |    2 
 fpicker/source/win32/misc/WinImplHelper.cxx                        |    4 
 framework/inc/helper/propertysetcontainer.hxx                      |    2 
 framework/source/fwe/classes/actiontriggercontainer.cxx            |    8 
 framework/source/fwe/classes/actiontriggerpropertyset.cxx          |   14 -
 framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx |   12 
 framework/source/fwe/classes/rootactiontriggercontainer.cxx        |   14 -
 framework/source/fwe/helper/titlehelper.cxx                        |    6 
 framework/source/helper/ocomponentaccess.cxx                       |    2 
 framework/source/helper/oframes.cxx                                |    2 
 framework/source/helper/uiconfigelementwrapperbase.cxx             |    6 
 framework/source/helper/uielementwrapperbase.cxx                   |    4 
 framework/source/services/desktop.cxx                              |    4 
 framework/source/services/frame.cxx                                |   20 -
 framework/source/services/tabwindowservice.cxx                     |    6 
 framework/source/tabwin/tabwindow.cxx                              |    8 
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx  |    8 
 framework/source/uiconfiguration/uiconfigurationmanager.cxx        |    8 
 framework/source/uiconfiguration/windowstateconfiguration.cxx      |    2 
 framework/source/uielement/menubarmanager.cxx                      |    4 
 framework/source/uielement/menubarwrapper.cxx                      |    2 
 framework/source/uielement/statusbarmanager.cxx                    |    6 
 framework/source/uielement/toolbarmanager.cxx                      |    4 
 framework/source/uielement/uicommanddescription.cxx                |    2 
 helpcontent2                                                       |    2 
 io/test/stm/datatest.cxx                                           |    8 
 javaunohelper/source/javaunohelper.cxx                             |   10 
 linguistic/source/convdiclist.cxx                                  |    2 
 mysqlc/source/mysqlc_resultset.cxx                                 |    6 
 mysqlc/source/mysqlc_statement.cxx                                 |    6 
 oox/source/export/ColorPropertySet.cxx                             |    2 
 oox/source/export/drawingml.cxx                                    |    2 
 package/source/xstor/oseekinstream.cxx                             |    2 
 package/source/xstor/owriteablestream.cxx                          |  136 +++++-----
 package/source/xstor/xstorage.cxx                                  |   80 ++---
 package/source/zippackage/ZipPackageFolder.cxx                     |    2 
 package/source/zippackage/zipfileaccess.cxx                        |    2 
 pyuno/source/module/pyuno_runtime.cxx                              |    2 
 reportdesign/source/core/api/ReportControlModel.cxx                |    2 
 reportdesign/source/filter/xml/xmlHelper.cxx                       |   10 
 reportdesign/source/filter/xml/xmlfilter.cxx                       |   10 
 reportdesign/source/ui/report/propbrw.cxx                          |    4 
 sdext/source/presenter/PresenterSlideShowView.cxx                  |   34 +-
 sot/source/base/exchange.cxx                                       |    6 
 sot/source/unoolestorage/xolesimplestorage.cxx                     |    2 
 starmath/source/mathmlimport.cxx                                   |    2 
 starmath/source/unomodel.cxx                                       |   12 
 stoc/source/corereflection/crarray.cxx                             |    2 
 stoc/source/corereflection/crcomp.cxx                              |    4 
 stoc/source/corereflection/crefl.cxx                               |   10 
 stoc/source/corereflection/crenum.cxx                              |    4 
 stoc/source/corereflection/criface.cxx                             |    8 
 stoc/source/invocation/invocation.cxx                              |   54 +--
 stoc/source/invocation_adapterfactory/iafactory.cxx                |    9 
 stoc/source/javaloader/javaloader.cxx                              |    2 
 stoc/source/proxy_factory/proxyfac.cxx                             |    7 
 stoc/source/security/permissions.cxx                               |   16 -
 stoc/source/servicemanager/servicemanager.cxx                      |    8 
 stoc/source/typeconv/convert.cxx                                   |    2 
 stoc/test/testconv.cxx                                             |   36 +-
 stoc/test/testcorefl.cxx                                           |    2 
 stoc/test/testiadapter.cxx                                         |   18 -
 stoc/test/testintrosp.cxx                                          |   10 
 svl/source/fsstor/fsstorage.cxx                                    |    8 
 svl/source/fsstor/oinputstreamcontainer.cxx                        |   10 
 svl/source/fsstor/ostreamcontainer.cxx                             |   14 -
 sw/source/filter/ww8/docxattributeoutput.cxx                       |    4 
 toolkit/source/controls/controlmodelcontainerbase.cxx              |    2 
 toolkit/source/controls/geometrycontrolmodel.cxx                   |    2 
 toolkit/source/controls/roadmapcontrol.cxx                         |    2 
 toolkit/source/controls/stdtabcontroller.cxx                       |    4 
 toolkit/source/controls/tabpagecontainer.cxx                       |    2 
 toolkit/source/controls/unocontrol.cxx                             |    2 
 ucb/source/core/ucbprops.cxx                                       |    3 
 ucb/source/core/ucbstore.cxx                                       |    2 
 ucb/source/sorter/sortresult.cxx                                   |    2 
 ucbhelper/source/provider/contentidentifier.cxx                    |    6 
 ucbhelper/source/provider/resultsetmetadata.cxx                    |   10 
 unotools/source/accessibility/accessiblerelationsethelper.cxx      |    6 
 unotools/source/accessibility/accessiblestatesethelper.cxx         |    6 
 unotools/source/config/lingucfg.cxx                                |   10 
 unotools/source/ucbhelper/xtempfile.cxx                            |    2 
 vbahelper/source/msforms/vbauserform.cxx                           |    2 
 vbahelper/source/vbahelper/vbahelper.cxx                           |    2 
 winaccessibility/source/UAccCOM/AccEditableText.cxx                |   16 -
 winaccessibility/source/UAccCOM/MAccessible.cxx                    |    6 
 winaccessibility/source/service/AccObject.cxx                      |   10 
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx                    |    8 
 117 files changed, 525 insertions(+), 541 deletions(-)

New commits:
commit ac76cc7e605b1bc9c0ff8e24d0b9995a8247074e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri May 23 22:11:27 2014 +0200

    Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part20
    
    Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68

diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 2c58848..5663cd5 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -87,8 +87,8 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel      >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XControlContainer    >*)NULL )   ,
+            static OTypeCollection aTypeCollection  (   cppu::UnoType<XControlModel>::get(),
+                                                          cppu::UnoType<XControlContainer>::get(),
                                                         BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -250,7 +250,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
         }
 
         // Send message to all listener
-        OInterfaceContainerHelper* pInterfaceContainer = m_aListeners.getContainer( ::getCppuType((const Reference< XContainerListener >*)0) );
+        OInterfaceContainerHelper* pInterfaceContainer = m_aListeners.getContainer( cppu::UnoType<XContainerListener>::get());
 
         if (pInterfaceContainer)
         {
@@ -300,7 +300,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
                 maControlInfoList.erase(itr);
 
                 // Send message to all other listener
-                OInterfaceContainerHelper * pInterfaceContainer = m_aListeners.getContainer( ::getCppuType((const Reference< XContainerListener >*)0) );
+                OInterfaceContainerHelper * pInterfaceContainer = m_aListeners.getContainer( cppu::UnoType<XContainerListener>::get());
 
                 if (pInterfaceContainer)
                 {
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 312bd6b..78cc308 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -130,12 +130,12 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XPaintListener >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XWindowListener>*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XView          >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XWindow        >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XServiceInfo   >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XControl       >*)NULL ) ,
+            static OTypeCollection aTypeCollection( cppu::UnoType<XPaintListener>::get(),
+                                                    cppu::UnoType<XWindowListener>::get(),
+                                                    cppu::UnoType<XView>::get(),
+                                                    cppu::UnoType<XWindow>::get(),
+                                                    cppu::UnoType<XServiceInfo>::get(),
+                                                    cppu::UnoType<XControl>::get(),
                                                     OComponentHelper::getTypes()
                                                   );
 
@@ -481,84 +481,84 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep
 
 void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XWindowListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XFocusListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XKeyListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XMouseListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XMouseMotionListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
+    impl_getMultiplexer()->advise( cppu::UnoType<XPaintListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XWindowListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XFocusListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XKeyListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseListener>::get(), xListener );
 }
 
 //  XWindow
 
 void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseMotionListener>::get(), xListener );
 }
 
 //  XWindow
 
 void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
+    impl_getMultiplexer()->unadvise( cppu::UnoType<XPaintListener>::get(), xListener );
 }
 
 //  XView
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 8ddaa4c..86e551a 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -392,19 +392,19 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWind
                                                         const   Type&                   aType   )
 {
     // add a listener to the source (peer)
-    if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
+    if( aType == cppu::UnoType<XWindowListener>::get())
         xPeer->addWindowListener( this );
-    else if( aType == ::getCppuType((const Reference< XKeyListener >*)0) )
+    else if( aType == cppu::UnoType<XKeyListener>::get())
         xPeer->addKeyListener( this );
-    else if( aType == ::getCppuType((const Reference< XFocusListener >*)0) )
+    else if( aType == cppu::UnoType<XFocusListener>::get())
         xPeer->addFocusListener( this );
-    else if( aType == ::getCppuType((const Reference< XMouseListener >*)0) )
+    else if( aType == cppu::UnoType<XMouseListener>::get())
         xPeer->addMouseListener( this );
-    else if( aType == ::getCppuType((const Reference< XMouseMotionListener >*)0) )
+    else if( aType == cppu::UnoType<XMouseMotionListener>::get())
         xPeer->addMouseMotionListener( this );
-    else if( aType == ::getCppuType((const Reference< XPaintListener >*)0) )
+    else if( aType == cppu::UnoType<XPaintListener>::get())
         xPeer->addPaintListener( this );
-    else if( aType == ::getCppuType((const Reference< XTopWindowListener >*)0) )
+    else if( aType == cppu::UnoType<XTopWindowListener>::get())
     {
         Reference< XTopWindow > xTop( xPeer, UNO_QUERY );
         if( xTop.is() )
@@ -422,19 +422,19 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(  const   Reference< X
                                                             const   Type&                   aType   )
 {
     // the last listener is removed, remove the listener from the source (peer)
-    if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
+    if( aType == cppu::UnoType<XWindowListener>::get())
         xPeer->removeWindowListener( this );
-    else if( aType == ::getCppuType((const Reference< XKeyListener >*)0) )
+    else if( aType == cppu::UnoType<XKeyListener>::get())
         xPeer->removeKeyListener( this );
-    else if( aType == ::getCppuType((const Reference< XFocusListener >*)0) )
+    else if( aType == cppu::UnoType<XFocusListener>::get())
         xPeer->removeFocusListener( this );
-    else if( aType == ::getCppuType((const Reference< XMouseListener >*)0) )
+    else if( aType == cppu::UnoType<XMouseListener>::get())
         xPeer->removeMouseListener( this );
-    else if( aType == ::getCppuType((const Reference< XMouseMotionListener >*)0) )
+    else if( aType == cppu::UnoType<XMouseMotionListener>::get())
         xPeer->removeMouseMotionListener( this );
-    else if( aType == ::getCppuType((const Reference< XPaintListener >*)0) )
+    else if( aType == cppu::UnoType<XPaintListener>::get())
         xPeer->removePaintListener( this );
-    else if( aType == ::getCppuType((const Reference< XTopWindowListener >*)0) )
+    else if( aType == cppu::UnoType<XTopWindowListener>::get())
     {
         Reference< XTopWindow >  xTop( xPeer, UNO_QUERY );
         if( xTop.is() )
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 7b50c32..2be1c04 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -122,9 +122,9 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std:
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel              >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XControlContainer            >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XConnectionPointContainer    >*)NULL )   ,
+            static OTypeCollection aTypeCollection  (   cppu::UnoType<XControlModel>::get(),
+                                                          cppu::UnoType<XControlContainer>::get(),
+                                                          cppu::UnoType<XConnectionPointContainer>::get(),
                                                         BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -444,8 +444,8 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
 
     // notify the listeners
     sal_Int32   nFrameId = PROPERTYHANDLE_FRAME;
-    Any aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) );
-    Any aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) );
+    Any aNewFrame ( &xNewFrame, cppu::UnoType<XFrame>::get());
+    Any aOldFrame ( &xOldFrame, cppu::UnoType<XFrame>::get());
 
     fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
 
@@ -471,8 +471,8 @@ void FrameControl::impl_deleteFrame()
 
     // notify the listeners
     sal_Int32 nFrameId = PROPERTYHANDLE_FRAME;
-    Any aNewFrame( &xNullFrame, ::getCppuType((const Reference< XFrame2 >*)0) );
-    Any aOldFrame( &xOldFrame, ::getCppuType((const Reference< XFrame2 >*)0) );
+    Any aNewFrame( &xNullFrame, cppu::UnoType<XFrame2>::get());
+    Any aOldFrame( &xOldFrame, cppu::UnoType<XFrame2>::get());
     fire( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
 
     // dispose the frame
@@ -487,8 +487,8 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
     // All Properties of this implementation. The array must be sorted!
     static const Property pPropertys[PROPERTY_COUNT] =
     {
-        Property( PROPERTYNAME_COMPONENTURL, PROPERTYHANDLE_COMPONENTURL, ::getCppuType((const OUString*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
-        Property( PROPERTYNAME_FRAME, PROPERTYHANDLE_FRAME, ::getCppuType((const Reference< XFrame >*)0), PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
+        Property( PROPERTYNAME_COMPONENTURL, PROPERTYHANDLE_COMPONENTURL, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+        Property( PROPERTYNAME_FRAME, PROPERTYHANDLE_FRAME, cppu::UnoType<XFrame>::get(), PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
         Property( PROPERTYNAME_LOADERARGUMENTS, PROPERTYHANDLE_LOADERARGUMENTS, ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
     };
 
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index e657dd5..18ac7e5 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -120,8 +120,8 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  ( ::getCppuType(( const Reference< XControlModel >*) NULL ) ,
-                                                      ::getCppuType(( const Reference< XProgressBar  >*) NULL ) ,
+            static OTypeCollection aTypeCollection  ( cppu::UnoType<XControlModel>::get(),
+                                                      cppu::UnoType<XProgressBar>::get(),
                                                       BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 4e7e114..93be6b9 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -161,9 +161,9 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection ( ::getCppuType(( const css::uno::Reference< XLayoutConstrains >*)NULL )   ,
-                                                     ::getCppuType(( const css::uno::Reference< XButton           >*)NULL )   ,
-                                                     ::getCppuType(( const css::uno::Reference< XProgressMonitor  >*)NULL )   ,
+            static OTypeCollection aTypeCollection ( cppu::UnoType<XLayoutConstrains>::get(),
+                                                     cppu::UnoType<XButton>::get(),
+                                                     cppu::UnoType<XProgressMonitor>::get(),
                                                      BaseContainerControl::getTypes()
                                                    );
             // ... and set his address to static pointer!
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 4acfdfa..b34b273 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -130,8 +130,8 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  ( ::getCppuType(( const css::uno::Reference< XLayoutConstrains    >*)NULL )   ,
-                                                      ::getCppuType(( const css::uno::Reference< XStatusIndicator >*)NULL )   ,
+            static OTypeCollection aTypeCollection  ( cppu::UnoType<XLayoutConstrains>::get(),
+                                                      cppu::UnoType<XStatusIndicator>::get(),
                                                       BaseContainerControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 8db2cc3..80f2d9c 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -567,7 +567,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
             {
                 ImplSetLineBundle();
                 drawing::FillStyle eFillStyle = drawing::FillStyle_NONE;
-                aAny.setValue( &eFillStyle, ::getCppuType((const drawing::FillStyle*)0) );
+                aAny.setValue( &eFillStyle, cppu::UnoType<drawing::FillStyle>::get());
                 maXPropSet->setPropertyValue( "FillStyle", aAny );
             }
         }
@@ -826,7 +826,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
         if ( nWidth == -1 )
         {
             sal_Bool bTrue( sal_True );
-            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0 ));
+            aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get());
             maXPropSet->setPropertyValue( "TextAutoGrowWidth", aAny );
 
             drawing::TextAdjust eTextAdjust;
@@ -850,11 +850,11 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
         if ( nHeight == -1 )
         {
             sal_Bool bTrue = sal_True;
-            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0) );
+            aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get());
             maXPropSet->setPropertyValue( "TextAutoGrowHeight", aAny );
         }
         uno::Reference< text::XText >  xText;
-        uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) ));
+        uno::Any aFirstQuery( maXShape->queryInterface( cppu::UnoType<text::XText>::get()));
         if( aFirstQuery >>= xText )
         {
             OUString aStr( OUString::createFromAscii( pString ) );
@@ -863,12 +863,12 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
             {
                 aXTextCursor->gotoEnd( sal_False );
                 uno::Reference< text::XTextRange >  aCursorText;
-                uno::Any aSecondQuery( aXTextCursor->queryInterface( ::getCppuType((const uno::Reference< text::XTextRange >*)0) ));
+                uno::Any aSecondQuery( aXTextCursor->queryInterface( cppu::UnoType<text::XTextRange>::get()));
                 if ( aSecondQuery >>= aCursorText )
                 {
                     uno::Reference< beans::XPropertySet >  aCursorPropSet;
 
-                    uno::Any aQuery( aCursorText->queryInterface( ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ));
+                    uno::Any aQuery( aCursorText->queryInterface( cppu::UnoType<beans::XPropertySet>::get()));
                     if( aQuery >>= aCursorPropSet )
                     {
                         if ( nWidth != -1 )     // paragraph adjusting in a valid textbox ?
@@ -892,7 +892,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
                         if ( nWidth > 0 && nHeight > 0 )    // restricted text
                         {
                             sal_Bool bTrue = sal_True;
-                            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0));
+                            aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get());
                             maXPropSet->setPropertyValue( "TextFitToSize", aAny );
                         }
                         aCursorText->setString( aStr );
@@ -919,7 +919,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla
         if ( aShape.is() )
         {
             uno::Reference< text::XText >  xText;
-            uno::Any aFirstQuery(  aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) );
+            uno::Any aFirstQuery(  aShape->queryInterface( cppu::UnoType<text::XText>::get()) );
             if( aFirstQuery >>= xText )
             {
                 OUString aStr( OUString::createFromAscii( pString ) );
@@ -929,11 +929,11 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla
                 {
                     aXTextCursor->gotoEnd( sal_False );
                     uno::Reference< text::XTextRange >  aCursorText;
-                    uno::Any aSecondQuery(aXTextCursor->queryInterface( ::getCppuType((const uno::Reference< text::XTextRange >*)0) ));
+                    uno::Any aSecondQuery(aXTextCursor->queryInterface( cppu::UnoType<text::XTextRange>::get()));
                     if ( aSecondQuery >>= aCursorText )
                     {
                         uno::Reference< beans::XPropertySet >  aPropSet;
-                        uno::Any aQuery(aCursorText->queryInterface( ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ));
+                        uno::Any aQuery(aCursorText->queryInterface( cppu::UnoType<beans::XPropertySet>::get()));
                         if( aQuery >>= aPropSet )
                         {
                             aCursorText->setString( aStr );
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 7217ec1..d7ce53b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1779,7 +1779,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
     PolyPolygon aRetPolyPoly;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet;
     ::com::sun::star::uno::Any aAny( rXShape->queryInterface(
-        ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >*) 0 ) ));
+        cppu::UnoType<com::sun::star::beans::XPropertySet>::get()));
 
     OUString sPolyPolygonBezier ( "PolyPolygonBezier" );
     OUString sPolyPolygon       ( "PolyPolygon" );
@@ -1808,7 +1808,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
     Polygon aPolygon;
     PolyPolygon aPolyPolygon;
 
-    if ( rAny.getValueType() == ::getCppuType( ( const ::com::sun::star::drawing::PolyPolygonBezierCoords* ) 0 ) )
+    if ( rAny.getValueType() == cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get())
     {
         ::com::sun::star::drawing::PolyPolygonBezierCoords* pSourcePolyPolygon
             = (::com::sun::star::drawing::PolyPolygonBezierCoords*)rAny.getValue();
@@ -2329,7 +2329,7 @@ bool EscherPropertyContainer::CreateConnectorProperties(
         ::com::sun::star::awt::Point aStartPoint, aEndPoint;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet;
         ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aShapeA, aShapeB;
-        ::com::sun::star::uno::Any aAny( rXShape->queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >*) 0 ) ));
+        ::com::sun::star::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<com::sun::star::beans::XPropertySet>::get()));
         if ( aAny >>= aXPropSet )
         {
             if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, true ) )
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index fbb419d..d037611 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -137,7 +137,7 @@ const uno::Reference< container::XIndexContainer >&
                 OSL_ENSURE( xForms.is(), "XForms not available" );
 
                 aTmp.setValue( &xForm,
-                    ::getCppuType((uno::Reference < form::XForm >*)0));
+                    cppu::UnoType<form::XForm>::get());
                 xForms->insertByIndex( xForms->getCount(), aTmp );
 
                 xFormComps = uno::Reference< container::XIndexContainer >
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 7458873..20acbda 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1659,8 +1659,7 @@ bool PPTConvertOCXControls::InsertControl(
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > & rFormComps =
             GetFormComps();
 
-        ::com::sun::star::uno::Any aTmp( &rFComp, ::getCppuType((const ::com::sun::star::uno::Reference<
-            com::sun::star::form::XFormComponent >*)0) );
+        ::com::sun::star::uno::Any aTmp( &rFComp, cppu::UnoType<com::sun::star::form::XFormComponent>::get() );
 
         rFormComps->insertByIndex( rFormComps->getCount(), aTmp );
 
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 7703264..32274e9 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -254,8 +254,8 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be
         // create an XProperty set to configure the exporter for pretty printing
          PropertyMapEntry aImportInfoMap[] =
          {
-             { OUString("UsePrettyPrinting"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
-             { OUString("ExportTextNumberElement"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0},
+             { OUString("UsePrettyPrinting"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
+             { OUString("ExportTextNumberElement"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
              { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
              { OUString(), 0, css::uno::Type(), 0, 0 }
          };
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index df9ab44..0f643f1 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -151,22 +151,22 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw
 
 Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception)
 {
-    if (rType == ::getCppuType( (Reference< ::com::sun::star::ui::dialogs::XExecutableDialog > const *)0 ))
+    if (rType == cppu::UnoType<com::sun::star::ui::dialogs::XExecutableDialog>::get())
     {
         void * p = static_cast< ::com::sun::star::ui::dialogs::XExecutableDialog * >( this );
         return Any( &p, rType );
     }
-    else if (rType == ::getCppuType( (Reference< XServiceInfo > const *)0 ))
+    else if (rType == cppu::UnoType<XServiceInfo>::get())
     {
         void * p = static_cast< XServiceInfo * >( this );
         return Any( &p, rType );
     }
-    else if (rType == ::getCppuType( (Reference< XInitialization > const *)0 ))
+    else if (rType == cppu::UnoType<XInitialization>::get())
     {
         void * p = static_cast< XInitialization * >( this );
         return Any( &p, rType );
     }
-    else if (rType == ::getCppuType( (Reference< XTerminateListener > const *)0 ))
+    else if (rType == cppu::UnoType<XTerminateListener>::get())
     {
         void * p = static_cast< XTerminateListener * >( this );
         return Any( &p, rType );
@@ -230,14 +230,14 @@ namespace
     public:
         DialogComponentTypes() :
             m_aTypes(
-                ::getCppuType( (const Reference< XComponent > *)0 ),
-                ::getCppuType( (const Reference< XTypeProvider > *)0 ),
-                ::getCppuType( (const Reference< XAggregation > *)0 ),
-                ::getCppuType( (const Reference< XWeak > *)0 ),
-                ::getCppuType( (const Reference< XServiceInfo > *)0 ),
-                ::getCppuType( (const Reference< XInitialization > *)0 ),
-                ::getCppuType( (const Reference< XTerminateListener > *)0 ),
-                ::getCppuType( (const Reference< ::com::sun::star::ui::dialogs::XExecutableDialog > *)0 ))
+                cppu::UnoType<XComponent>::get(),
+                cppu::UnoType<XTypeProvider>::get(),
+                cppu::UnoType<XAggregation>::get(),
+                cppu::UnoType<XWeak>::get(),
+                cppu::UnoType<XServiceInfo>::get(),
+                cppu::UnoType<XInitialization>::get(),
+                cppu::UnoType<XTerminateListener>::get(),
+                cppu::UnoType<com::sun::star::ui::dialogs::XExecutableDialog>::get())
         {
         }
         OTypeCollection& getTypeCollection() { return m_aTypes; }
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 9fb6e46..262bd89 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -393,7 +393,7 @@ Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (Runtime
 {
     // if asked for the XTypeProvider, don't let OButtonControl_BASE do this
     Any aReturn;
-    if ( !_rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ) ) )
+    if ( !_rType.equals( cppu::UnoType<XTypeProvider>::get() ) )
         aReturn = OButtonControl_BASE::queryInterface( _rType );
 
     if ( !aReturn.hasValue() )
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 241476c..f53fa14 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -178,11 +178,11 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE
 {
     Any aReturn;
     // some functionality at our aggregate cannot be reasonably fulfilled here.
-    if  (   _rType.equals(::getCppuType(static_cast< Reference< XFormComponent >* >(NULL)))
-        ||  _rType.equals(::getCppuType(static_cast< Reference< XServiceInfo >* >(NULL)))
-        ||  _rType.equals(::getCppuType(static_cast< Reference< XBindableValue >* >(NULL)))
-        ||  _rType.equals(::getCppuType(static_cast< Reference< XPropertyContainer >* >(NULL)))
-        ||  comphelper::isAssignableFrom(::getCppuType(static_cast< Reference< XTextRange >* >(NULL)),_rType)
+    if  (   _rType.equals(cppu::UnoType<XFormComponent>::get())
+        ||  _rType.equals(cppu::UnoType<XServiceInfo>::get())
+        ||  _rType.equals(cppu::UnoType<XBindableValue>::get())
+        ||  _rType.equals(cppu::UnoType<XPropertyContainer>::get())
+        ||  comphelper::isAssignableFrom(cppu::UnoType<XTextRange>::get(),_rType)
         )
         return aReturn;
 
@@ -402,10 +402,10 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV
             bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aLabel);
             break;
         case PROPERTY_ID_WIDTH:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aWidth, ::getCppuType((const sal_Int32*)NULL));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aWidth, cppu::UnoType<sal_Int32>::get());
             break;
         case PROPERTY_ID_ALIGN:
-            bModified = tryPropertyValue( rConvertedValue, rOldValue, rValue, m_aAlign, ::getCppuType( (const sal_Int32*)NULL ) );
+            bModified = tryPropertyValue( rConvertedValue, rOldValue, rValue, m_aAlign, cppu::UnoType<sal_Int32>::get());
             // strange enough, css.awt.TextAlign is a 32-bit integer, while the Align property (both here for grid controls
             // and for ordinary toolkit controls) is a 16-bit integer. So, allow for 32 bit, but normalize it to 16 bit
             if ( bModified )
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index e4f3219..c5f3643 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -216,7 +216,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
         return;
 
     aTmp = xFormSet->getPropertyValue( PROPERTY_TARGET_URL );
-    if (!aTmp.getValueType().equals(::getCppuType((const OUString*)NULL)) ||
+    if (!aTmp.getValueType().equals(cppu::UnoType<OUString>::get()) ||
         getString(aTmp).isEmpty() )
         return;
 
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 55714e1..6b8ca64 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -108,9 +108,9 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
         nAnyMask |= DEFAULT_LONG;
     else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
         nAnyMask |= DEFAULT_DOUBLE;
-    else if (m_aDefault.getValueType() == ::getCppuType((const util::Time*)0))
+    else if (m_aDefault.getValueType() == cppu::UnoType<util::Time>::get())
         nAnyMask |= DEFAULT_TIME;
-    else if (m_aDefault.getValueType() == ::getCppuType((const util::Date*)0))
+    else if (m_aDefault.getValueType() == cppu::UnoType<util::Date>::get())
         nAnyMask |= DEFAULT_DATE;
 
     if (m_bFilterProposal)  // Don't save a value, because it's boolean
@@ -308,13 +308,13 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO
             bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefaultText);
             break;
         case PROPERTY_ID_DEFAULT_VALUE:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, ::getCppuType((const double*)0));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, cppu::UnoType<double>::get());
             break;
         case PROPERTY_ID_DEFAULT_DATE:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, ::getCppuType((const util::Date*)0));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, cppu::UnoType<util::Date>::get());
             break;
         case PROPERTY_ID_DEFAULT_TIME:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, ::getCppuType((const util::Time*)0));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefault, cppu::UnoType<util::Time>::get());
             break;
         default:
             bModified = OBoundControlModel::convertFastPropertyValue(
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 951a37f..615688e 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -358,7 +358,7 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx
     Any aReturn;
 
     // XTypeProvider first - don't ask the OBoundControl_BASE, it would deliver incomplete types
-    if ( _rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ) ) )
+    if ( _rType.equals( cppu::UnoType<XTypeProvider>::get() ) )
         aReturn = OControl::queryAggregation( _rType );
 
     // ask our own interfaces
@@ -462,7 +462,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE
         {
             aReturn = OPropertySetAggregationHelper::queryInterface(_rType);
             // our aggregate
-            if (!aReturn.hasValue() && m_xAggregate.is() && !_rType.equals(::getCppuType(static_cast< Reference< XCloneable>* >(NULL))))
+            if (!aReturn.hasValue() && m_xAggregate.is() && !_rType.equals(cppu::UnoType<XCloneable>::get()))
                 aReturn = m_xAggregate->queryAggregation(_rType);
         }
     }
@@ -975,12 +975,12 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
     switch (_nHandle)
     {
         case PROPERTY_ID_NAME:
-            DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL),
+            DBG_ASSERT(_rValue.getValueType() == cppu::UnoType<OUString>::get(),
                 "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
             _rValue >>= m_aName;
             break;
         case PROPERTY_ID_TAG:
-            DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL),
+            DBG_ASSERT(_rValue.getValueType() == cppu::UnoType<OUString>::get(),
                 "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
             _rValue >>= m_aTag;
             break;
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index b30c53e..e3ae3ff 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -140,7 +140,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
 {
     Any aReturn;
 
-    if (_rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >(NULL) ) ) )
+    if (_rType.equals( cppu::UnoType<XTypeProvider>::get() ) )
     {   // a XTypeProvider interface needs a working aggregate - we don't want to give the type provider
         // of our base class (OFormattedFieldWrapper_Base) to the caller as it supplies nearly nothing
         ensureAggregate();
@@ -152,7 +152,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
     {
         aReturn = OFormattedFieldWrapper_Base::queryAggregation(_rType);
 
-        if ((_rType.equals( ::getCppuType( static_cast< Reference< XServiceInfo >* >(NULL) ) ) ) && aReturn.hasValue())
+        if ((_rType.equals( cppu::UnoType<XServiceInfo>::get() ) ) && aReturn.hasValue())
         {   // somebody requested an XServiceInfo interface and our base class provided it
             // check our aggregate if it has one, too
             ensureAggregate();
@@ -200,7 +200,7 @@ Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames(
 {
     DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!");
     Reference< XServiceInfo > xSI;
-    m_xAggregate->queryAggregation(::getCppuType(static_cast< Reference< XServiceInfo >* >(NULL))) >>= xSI;
+    m_xAggregate->queryAggregation(cppu::UnoType<XServiceInfo>::get()) >>= xSI;
     return xSI->getSupportedServiceNames();
 }
 
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 196f2c3..e9a306d 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -67,7 +67,7 @@ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiSer
 }
 OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, OUString())
-    ,OInterfaceContainer(_rxFactory, m_aMutex, ::getCppuType(static_cast<Reference<XPropertySet>*>(NULL)))
+    ,OInterfaceContainer(_rxFactory, m_aMutex, cppu::UnoType<XPropertySet>::get())
     ,OErrorBroadcaster( OComponentHelper::rBHelper )
     ,FontControlModel( false )
     ,m_aSelectListeners(m_aMutex)
@@ -90,7 +90,7 @@ OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFact
 
 OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
-    ,OInterfaceContainer( _rxFactory, m_aMutex, ::getCppuType( static_cast<Reference<XPropertySet>*>( NULL ) ) )
+    ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XPropertySet>::get() )
     ,OErrorBroadcaster( OComponentHelper::rBHelper )
     ,FontControlModel( _pOriginal )
     ,m_aSelectListeners( m_aMutex )
@@ -547,17 +547,17 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any&
             bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_nBorder);
             break;
         case PROPERTY_ID_BORDERCOLOR:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aBorderColor, ::getCppuType((const sal_Int32*)NULL));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aBorderColor, cppu::UnoType<sal_Int32>::get());
             break;
         case PROPERTY_ID_DEFAULTCONTROL:
             bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aDefaultControl);
             break;
         case PROPERTY_ID_BACKGROUNDCOLOR:
-            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aBackgroundColor, ::getCppuType((const sal_Int32*)NULL));
+            bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aBackgroundColor, cppu::UnoType<sal_Int32>::get());
             break;
         case PROPERTY_ID_ROWHEIGHT:
             {
-                bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aRowHeight, ::getCppuType((const sal_Int32*)NULL));
+                bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aRowHeight, cppu::UnoType<sal_Int32>::get());
                 sal_Int32 nNewVal( 0 );
                 if ( ( rConvertedValue >>= nNewVal ) && ( nNewVal <= 0 ) )
                 {
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index c2691ae..fc3b65a 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -217,7 +217,7 @@ Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (Run
 
     // BUT: _don't_ let it feel responsible for the XTypeProvider interface
     // (as this is implemented by our base class in the proper way)
-    if  (   _rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ) )
+    if  (   _rType.equals( cppu::UnoType<XTypeProvider>::get() )
         ||  !aReturn.hasValue()
         )
         aReturn = OBoundControlModel::queryAggregation( _rType );
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index a99066c..55bd6ca 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -595,7 +595,7 @@ namespace frm
 
         // BUT: _don't_ let it feel responsible for the XTypeProvider interface
         // (as this is implemented by our base class in the proper way)
-        if  (   _rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ) )
+        if  (   _rType.equals( cppu::UnoType<XTypeProvider>::get() )
             ||  !aReturn.hasValue()
             )
             aReturn = OControlModel::queryAggregation( _rType );
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index d2562bf..b3f4afe 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -164,7 +164,7 @@ namespace frm
     Sequence< Type > OReferenceValueComponent::getSupportedBindingTypes()
     {
         ::std::list< Type > aTypes;
-        aTypes.push_back( ::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
+        aTypes.push_back( cppu::UnoType<sal_Bool>::get() );
 
         if ( !m_sReferenceValue.isEmpty() )
             aTypes.push_front( cppu::UnoType<OUString>::get() );
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index c65daec..cd81e79 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -49,8 +49,8 @@ namespace frm
                 SVX_UNOEDIT_CHAR_PROPERTIES,
                 SVX_UNOEDIT_FONT_PROPERTIES,
                 SVX_UNOEDIT_PARA_PROPERTIES,
-                { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
-                { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
+                { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
+                { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
                 { OUString(), 0, css::uno::Type(), 0, 0 }
             };
             static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index f665cdd..2e304a2 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -205,7 +205,7 @@ namespace xforms
 
     Type SAL_CALL ODataTypeRepository::getElementType(  ) throw (RuntimeException, std::exception)
     {
-        return ::getCppuType( static_cast< Reference< XDataType >* >( NULL ) );
+        return cppu::UnoType<XDataType>::get();
     }
 
 
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index d436059..383624d 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -234,7 +234,7 @@ namespace xforms
     protected:
         typedef     VALUE_TYPE  ValueType;
         inline const ::com::sun::star::uno::Type&
-            getCppuType() const { return ::getCppuType( static_cast< ValueType* >( NULL ) ); }
+            getCppuType() const { return cppu::UnoType<ValueType>::get(); }
 
     protected:
         OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass );
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 6b4aab4..842ab05 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -180,7 +180,7 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
     OUString aHelpText;
 
     ::cppu::OInterfaceContainerHelper* pICHelper =
-        rBHelper.getContainer( getCppuType((uno::Reference<XFilePickerListener>*)0));
+        rBHelper.getContainer( cppu::UnoType<XFilePickerListener>::get());
 
     if (pICHelper)
     {
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index e6cec94..ef77bb3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -207,14 +207,14 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
 void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
-    m_lListener.addInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
+    m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
 void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
-    m_lListener.removeInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
+    m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
@@ -305,7 +305,7 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 {
     static AsyncRequests aNotify(RequestHandlerRef(new AsyncPickerEvents()));
 
-    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*) NULL ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get());
     if ( ! pContainer)
         return;
 
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 9eb1401..7d116d7 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -263,7 +263,7 @@ void SAL_CALL CAsyncEventNotifier::run()
                 removeNextEventRecord();
 
                 ::cppu::OInterfaceContainerHelper* pICHelper =
-                    m_rBroadcastHelper.getContainer(getCppuType((uno::Reference<XFilePickerListener>*)0));
+                    m_rBroadcastHelper.getContainer(cppu::UnoType<XFilePickerListener>::get());
 
                 if (pICHelper)
                 {
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 3576aa1..9c5921f 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -296,7 +296,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         Any aAny;
         sal_Bool bChkState = sal_False;
 
-        aAny.setValue( &bChkState, getCppuType( (sal_Bool*)0 ) );
+        aAny.setValue( &bChkState, cppu::UnoType<sal_Bool>::get());
         xFPControlAccess->setValue( CHECKBOX_AUTOEXTENSION, 0, aAny );
 
         OUString aVersion( L"Version 1" );
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 6011bcf..e12241c 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -333,7 +333,7 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
     LRESULT lChkState = SendMessageW( hwnd, BM_GETCHECK, 0, 0 );
     sal_Bool bChkState = (lChkState == BST_CHECKED) ? sal_True : sal_False;
     Any aAny;
-    aAny.setValue( &bChkState, getCppuType((sal_Bool*)0) );
+    aAny.setValue( &bChkState, cppu::UnoType<sal_Bool>::get());
     return aAny;
 }
 
@@ -348,7 +348,7 @@ void SAL_CALL CheckboxSetState(
     OSL_ASSERT( IsWindow( hwnd ) );
 
     if ( !aState.hasValue( ) ||
-         aState.getValueType( ) != getCppuType((sal_Bool*)0) )
+         aState.getValueType( ) != cppu::UnoType<sal_Bool>::get())
          throw IllegalArgumentException(
             OUString( "invalid value type or any has no value" ),
             rXInterface,
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index e4b7592..2db5698 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -67,7 +67,7 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn
         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::Reference< com::sun::star::beans::XPropertySet >*)0);
+            return cppu::UnoType<com::sun::star::beans::XPropertySet>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index e03ecf1..d1c71ed 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -140,10 +140,10 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
         {
             // Create a static typecollection ...
             static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const Reference< XMultiServiceFactory   >*)NULL ) ,
-                        ::getCppuType(( const Reference< XIndexContainer        >*)NULL ) ,
-                        ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
+                        cppu::UnoType<XMultiServiceFactory>::get(),
+                        cppu::UnoType<XIndexContainer>::get(),
+                        cppu::UnoType<XServiceInfo>::get(),
+                        cppu::UnoType<XTypeProvider>::get());
 
             // ... and set his address to static pointer!
             pTypeCollection = &aTypeCollection;
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index a1d0e5e..1c06d9b 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -134,11 +134,11 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
         {
             // Create a static typecollection ...
             static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const Reference< XPropertySet           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XFastPropertySet       >*)NULL ) ,
-                        ::getCppuType(( const Reference< XMultiPropertySet      >*)NULL ) ,
-                        ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
+                        cppu::UnoType<XPropertySet>::get(),
+                        cppu::UnoType<XFastPropertySet>::get(),
+                        cppu::UnoType<XMultiPropertySet>::get(),
+                        cppu::UnoType<XServiceInfo>::get(),
+                        cppu::UnoType<XTypeProvider>::get());
 
             // ... and set his address to static pointer!
             pTypeCollection = &aTypeCollection;
@@ -309,9 +309,9 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr
     {
         Property( OUString( "CommandURL"    ), HANDLE_COMMANDURL   , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
         Property( OUString( "HelpURL"       ), HANDLE_HELPURL      , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "Image"         ), HANDLE_IMAGE     , ::getCppuType((Reference<XBitmap>*)0)     , PropertyAttribute::TRANSIENT  ),
+        Property( OUString( "Image"         ), HANDLE_IMAGE     , cppu::UnoType<XBitmap>::get(), PropertyAttribute::TRANSIENT  ),
         Property( OUString( "SubContainer"  ), HANDLE_SUBCONTAINER , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT  ),
-        Property( OUString( "Text"          ), HANDLE_TEXT         , ::getCppuType((Reference<XInterface>*)0)  , PropertyAttribute::TRANSIENT  )
+        Property( OUString( "Text"          ), HANDLE_TEXT         , cppu::UnoType<XInterface>::get(), PropertyAttribute::TRANSIENT  )
     };
 
     // Use it to initialize sequence!
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index c1c220e..127a365 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -127,11 +127,11 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
         {
             // Create a static typecollection ...
             static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const Reference< XPropertySet           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XFastPropertySet       >*)NULL ) ,
-                        ::getCppuType(( const Reference< XMultiPropertySet      >*)NULL ) ,
-                        ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
+                        cppu::UnoType<XPropertySet>::get(),
+                        cppu::UnoType<XFastPropertySet>::get(),
+                        cppu::UnoType<XMultiPropertySet>::get(),
+                        cppu::UnoType<XServiceInfo>::get(),
+                        cppu::UnoType<XTypeProvider>::get());
 
             // ... and set his address to static pointer!
             pTypeCollection = &aTypeCollection;
@@ -252,7 +252,7 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp
 {
     const Property pActionTriggerPropertys[] =
     {
-        Property( OUString( "SeparatorType" ), HANDLE_TYPE, ::getCppuType((sal_Int16*)0), PropertyAttribute::TRANSIENT )
+        Property( OUString( "SeparatorType" ), HANDLE_TYPE, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::TRANSIENT )
     };
 
     // Use it to initialize sequence!
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index fa408c6..23819a8 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -197,7 +197,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 Type SAL_CALL RootActionTriggerContainer::getElementType()
     throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return ::getCppuType(( Reference< XPropertySet >*)0);
+    return cppu::UnoType<XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
@@ -261,12 +261,12 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
         {
             // Create a static typecollection ...
             static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const Reference< XMultiServiceFactory   >*)NULL ) ,
-                        ::getCppuType(( const Reference< XIndexContainer        >*)NULL ) ,
-                        ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) ,
-                        ::getCppuType(( const Reference< XUnoTunnel             >*)NULL ) ,
-                        ::getCppuType(( const Reference< XNamed                 >*)NULL ));
+                        cppu::UnoType<XMultiServiceFactory>::get(),
+                        cppu::UnoType<XIndexContainer>::get(),
+                        cppu::UnoType<XServiceInfo>::get(),
+                        cppu::UnoType<XTypeProvider>::get(),
+                        cppu::UnoType<XUnoTunnel>::get(),
+                        cppu::UnoType<XNamed>::get());
 
             // ... and set his address to static pointer!
             pTypeCollection = &aTypeCollection;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index d1a6477..2f50a3e 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -139,14 +139,14 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css
     throw (css::uno::RuntimeException, std::exception)
 {
     // container is threadsafe by himself
-    m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener );
+    m_aListener.addInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
 }
 
 void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
     // container is threadsafe by himself
-    m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener );
+    m_aListener.removeInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
 }
 
 void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
@@ -265,7 +265,7 @@ void TitleHelper::impl_sendTitleChangedEvent ()
     aLock.clear ();
     // <- SYNCHRONIZED
 
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTitleChangeListener >*) NULL ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListener.getContainer( cppu::UnoType<css::frame::XTitleChangeListener>::get());
     if ( ! pContainer)
         return;
 
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 12206c1..67862b9 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -81,7 +81,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
 {
     // Elements in list an enumeration are components!
     // Return the uno-type of XComponent.
-    return ::getCppuType((const css::uno::Reference< XComponent >*)NULL);
+    return cppu::UnoType<XComponent>::get();
 }
 
 //  XElementAccess
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 7d86c50..d21680a 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -255,7 +255,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception )
 {
     // This "container" support XFrame-interfaces only!
-    return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL );
+    return cppu::UnoType<XFrame>::get();
 }
 
 //  XElementAccess
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 741b9ea..a31cdb2 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -435,13 +435,13 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
     const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
-        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE   , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
-        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE   , cppu::UnoType<com::sun::star::ui::XUIConfigurationManager>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , cppu::UnoType<com::sun::star::frame::XFrame>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE        , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT     , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR       , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR       , cppu::UnoType<com::sun::star::awt::XMenuBar>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
     const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 1273c83..b8780f2 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -228,8 +228,8 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement
 
     const com::sun::star::beans::Property pProperties[] =
     {
-        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , cppu::UnoType<XFrame>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , cppu::UnoType<sal_Int16>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
         com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 771dfa6..2bf3a09 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1581,8 +1581,8 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty
 
     const css::beans::Property pProperties[] =
     {
-        css::beans::Property( DESKTOP_PROPNAME_ACTIVEFRAME              , DESKTOP_PROPHANDLE_ACTIVEFRAME             , ::getCppuType((const css::uno::Reference< css::lang::XComponent >*)NULL)                , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
-        css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ),
+        css::beans::Property( DESKTOP_PROPNAME_ACTIVEFRAME              , DESKTOP_PROPHANDLE_ACTIVEFRAME             , cppu::UnoType<css::lang::XComponent>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
+        css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, cppu::UnoType<css::frame::XDispatchRecorderSupplier>::get(), css::beans::PropertyAttribute::TRANSIENT ),
         css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED                , DESKTOP_PROPHANDLE_ISPLUGGED               , ::getBooleanCppuType()                                                                  , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
         css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO    , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO   , ::getBooleanCppuType()                                                                  , css::beans::PropertyAttribute::TRANSIENT ),
         css::beans::Property( DESKTOP_PROPNAME_TITLE                    , DESKTOP_PROPHANDLE_TITLE                   , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT ),
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index e374471..2386f18 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1699,7 +1699,7 @@ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::fra
     TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
 }
 
 void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
@@ -1713,7 +1713,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
     TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
 }
 
 /*-****************************************************************************************************
@@ -1750,7 +1750,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
     // internal operations too ...
     // Note: container is threadsafe himself.
     css::lang::EventObject             aSource    (static_cast< ::cppu::OWeakObject*>(this));
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >*) NULL ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::util::XCloseListener>::get());
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -1784,7 +1784,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
         throw css::util::CloseVetoException("Component couldn't be deattached ...",static_cast< ::cppu::OWeakObject*>(this));
 
     // If closing is allowed ... inform all istener and dispose this frame!
-    pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >*) NULL ) );
+    pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::util::XCloseListener>::get());
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -1834,7 +1834,7 @@ void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCl
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
     // We don't need any lock here ...
     // Container lives if we live and is threadsafe by himself.
-    m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
 }
 
 void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
@@ -1843,7 +1843,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
     TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
     // We don't need any lock here ...
     // Container lives if we live and is threadsafe by himself.
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
 }
 
 OUString SAL_CALL Frame::getTitle()
@@ -2656,14 +2656,14 @@ void Frame::impl_initializePropInfo()
         css::beans::Property(
             FRAME_PROPNAME_DISPATCHRECORDERSUPPLIER,
             FRAME_PROPHANDLE_DISPATCHRECORDERSUPPLIER,
-            ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL),
+            cppu::UnoType<css::frame::XDispatchRecorderSupplier>::get(),
             css::beans::PropertyAttribute::TRANSIENT));
 
     impl_addPropertyInfo(
         css::beans::Property(
             FRAME_PROPNAME_INDICATORINTERCEPTION,
             FRAME_PROPHANDLE_INDICATORINTERCEPTION,
-            ::getCppuType((const css::uno::Reference< css::task::XStatusIndicator >*)NULL),
+            cppu::UnoType<css::task::XStatusIndicator>::get(),
             css::beans::PropertyAttribute::TRANSIENT));
 
     impl_addPropertyInfo(
@@ -2677,7 +2677,7 @@ void Frame::impl_initializePropInfo()
         css::beans::Property(
             FRAME_PROPNAME_LAYOUTMANAGER,
             FRAME_PROPHANDLE_LAYOUTMANAGER,
-            ::getCppuType((const css::uno::Reference< ::com::sun::star::frame::XLayoutManager >*)NULL),
+            cppu::UnoType<com::sun::star::frame::XLayoutManager>::get(),
             css::beans::PropertyAttribute::TRANSIENT));
 
     impl_addPropertyInfo(
@@ -2843,7 +2843,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
     // Get container for right listener.
     // FOLLOW LINES ARE THREADSAFE!!!
     // ( OInterfaceContainerHelper is synchronized with m_aListenerContainer! )
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XFrameActionListener >*) NULL ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::frame::XFrameActionListener>::get());
 
     if( pContainer != NULL )
     {
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 8aa1e64..2fefbdb 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -333,7 +333,7 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
 void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
-    m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener);
+    m_lListener.addInterface(cppu::UnoType<css::awt::XTabListener>::get(), xListener);
 }
 
 //  XSimpleTabController
@@ -341,7 +341,7 @@ void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::a
 void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
-    m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener);
+    m_lListener.removeInterface(cppu::UnoType<css::awt::XTabListener>::get(), xListener);
 }
 
 //  XComponent
@@ -445,7 +445,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
         return 0;
     }
 
-    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*) NULL));
+    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(cppu::UnoType<css::awt::XTabListener>::get());
     if ( ! pContainer)
         return 0;
 
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 05c1afc..eb2c829 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -162,7 +162,7 @@ void TabWindow::impl_SetTitle( const OUString& rTitle )
 void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID ) const
 {
     ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer(
-                                                        ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >*) NULL ) );
+                                                        cppu::UnoType<css::awt::XTabListener>::get());
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -199,7 +199,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID ) co
 void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& rSeq ) const
 {
     ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer(
-                                                        ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >*) NULL ) );
+                                                        cppu::UnoType<css::awt::XTabListener>::get());
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -774,7 +774,7 @@ throw (css::uno::RuntimeException, std::exception)
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     m_aListenerContainer.addInterface(
-        ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >* ) NULL ), xListener );
+        cppu::UnoType<css::awt::XTabListener>::get(), xListener );
 }
 
 void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener )
@@ -788,7 +788,7 @@ throw (css::uno::RuntimeException, std::exception)
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     m_aListenerContainer.removeInterface(
-        ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >* ) NULL ), xListener );
+        cppu::UnoType<css::awt::XTabListener>::get(), xListener );
 }
 
 //  OPropertySetHelper
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 42c57f0..3fea283 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -972,13 +972,13 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X
             throw DisposedException();
     }
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfiguration
@@ -992,13 +992,13 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe
             throw DisposedException();
     }
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
 }
 
 void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
 }
 
 // XUIConfigurationManager
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 717a3cf..09a201d 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -741,13 +741,13 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL
             throw DisposedException();
     }
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationManager
@@ -761,13 +761,13 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference<
             throw DisposedException();
     }
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
 }
 
 void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
 }
 
 void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 6b5ca07..94b31ec 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1453,7 +1453,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
 Type SAL_CALL WindowStateConfiguration::getElementType()
 throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) );
+    return( cppu::UnoType<XNameAccess>::get());
 }
 
 sal_Bool SAL_CALL WindowStateConfiguration::hasElements()
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 2755b67..de31c3c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -363,14 +363,14 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
     if ( m_bDisposed )
         throw DisposedException();
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event )
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 5ef7442..05a8be6 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -252,7 +252,7 @@ void MenuBarWrapper::fillPopupControllerCache()
 Type SAL_CALL MenuBarWrapper::getElementType()
 throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return ::getCppuType(( Reference< XDispatchProvider >*)0);
+    return cppu::UnoType<XDispatchProvider>::get();
 }
 
 sal_Bool SAL_CALL MenuBarWrapper::hasElements()
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 7ab55ac..a7b5343 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -243,14 +243,12 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE
     if ( m_bDisposed )
         throw lang::DisposedException();
 
-    m_aListenerContainer.addInterface( ::getCppuType(
-        ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception )
 {
-    m_aListenerContainer.removeInterface( ::getCppuType(
-        ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationListener
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index fba6752..2878d2b 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -643,12 +643,12 @@ void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener
     if ( m_bDisposed )
         throw DisposedException();
 
-    m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
 {
-    m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
+    m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationListener
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 344511f..f27ffdd 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -736,7 +736,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
 Type SAL_CALL UICommandDescription::getElementType()
 throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) );
+    return( cppu::UnoType<XNameAccess>::get());
 }
 
 sal_Bool SAL_CALL UICommandDescription::hasElements()
diff --git a/helpcontent2 b/helpcontent2
index 2ef15cb..fdfcaa9 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2ef15cb93840390d9927f64bddb958ad699cb792
+Subproject commit fdfcaa991224f6ac15fdc778e0a301b9285208eb
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 0c4b2be..a5d3b79 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -484,7 +484,7 @@ void MyPersistObject::setPropertyValue(
         aValue >>= m_s;
     }
     else if( aPropertyName.equalsAscii("object") ) {
-        if( aValue.getValueType() == getCppuType( (Reference< XPersistObject> *)0 ) )
+        if( aValue.getValueType() == cppu::UnoType<XPersistObject>::get())
         {
             aValue >>= m_ref;
         }
@@ -858,9 +858,9 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
     Any o1 = r1->getPropertyValue("object");
     Any o2 = r2->getPropertyValue("object");
 
-    if( o1.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) {
+    if( o1.getValueType() == cppu::UnoType<XPersistObject>::get()) {
 
-        if( o2.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) {
+        if( o2.getValueType() == cppu::UnoType<XPersistObject>::get()) {
             Reference < XPersistObject > rPersist1;
             Reference < XPersistObject > rPersist2;
             o1 >>= rPersist1;
@@ -879,7 +879,7 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
         if( ! b ) fprintf( stderr, "compareMyPropertySet: 9\n" );
     }
     else {
-        if( o2.getValueType()  == getCppuType( (Reference<XPersistObject>*)0 ) ) {
+        if( o2.getValueType()  == cppu::UnoType<XPersistObject>::get()) {
             b = sal_False;
         }
         if( ! b ) fprintf( stderr, "compareMyPropertySet: 10\n" );
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index d779380..54d2864 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -104,10 +104,10 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                     {
                         void * pSMgr =
                             java2dest.mapInterface(
-                                jSMgr, getCppuType((Reference< lang::XMultiServiceFactory > *) 0) );
+                                jSMgr, cppu::UnoType<lang::XMultiServiceFactory>::get());
                         void * pKey =
                             java2dest.mapInterface(
-                                jRegKey, getCppuType((Reference< registry::XRegistryKey > *) 0) );
+                                jRegKey, cppu::UnoType<registry::XRegistryKey>::get());
 
                         uno_ExtEnvironment * env = loader_env.get()->pExtEnv;
                         if (pKey)
@@ -198,10 +198,10 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                     {
                         void * pSMgr =
                             java2dest.mapInterface(
-                                jSMgr, ::getCppuType((Reference< lang::XMultiServiceFactory > *) 0) );
+                                jSMgr, cppu::UnoType<lang::XMultiServiceFactory>::get());
                         void * pKey =
                             java2dest.mapInterface(
-                                jRegKey, ::getCppuType((Reference< registry::XRegistryKey > *) 0) );
+                                jRegKey, cppu::UnoType<registry::XRegistryKey>::get());
 
                         const char* pImplName = pJEnv->GetStringUTFChars( jImplName, NULL );
 
@@ -220,7 +220,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                         if (pSSF)
                         {
                             jobject jglobal = (jobject) dest2java.mapInterface(
-                                pSSF, getCppuType((Reference< XInterface > *) 0) );
+                                pSSF, cppu::UnoType<XInterface>::get());
                             joSLL_cpp = pJEnv->NewLocalRef( jglobal );
                             pJEnv->DeleteGlobalRef( jglobal );
                             if (env)
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index d5cf1b7..f1cc930 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -185,7 +185,7 @@ uno::Type SAL_CALL ConvDicNameContainer::getElementType(  )
     throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return uno::Type( ::getCppuType( (uno::Reference< XConversionDictionary > *) 0) );
+    return uno::Type( cppu::UnoType<XConversionDictionary>::get());
 }
 
 sal_Bool SAL_CALL ConvDicNameContainer::hasElements(  )
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 5942ae7..3541ec2 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -135,9 +135,9 @@ Sequence< Type > SAL_CALL OResultSet::getTypes()
     throw(RuntimeException, std::exception)
 {
     OSL_TRACE("OResultSet::getTypes");
-    OTypeCollection aTypes( ::getCppuType((const  Reference< XMultiPropertySet > *) NULL),
-                                                ::getCppuType((const Reference< XFastPropertySet > *) NULL),
-                                                ::getCppuType((const Reference< XPropertySet > *) NULL));
+    OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                                cppu::UnoType<XFastPropertySet>::get(),
+                                                cppu::UnoType<XPropertySet>::get());
 
     return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes());
 }
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 57b051e..2c6cb8e 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -121,9 +121,9 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes()
     throw(RuntimeException, std::exception)
 {
     OSL_TRACE("OCommonStatement::getTypes");
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return concatSequences(aTypes.getTypes(), OCommonStatement_IBase::getTypes());
 }
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index d3fe848..3ff4f28 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -56,7 +56,7 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
         // note: length of FillColor and LineColor is 9
         m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
         m_aColorProp( m_aColorPropName, -1,
-                      ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), 0)
+                      cppu::UnoType<sal_Int32>::get(), 0)
 {}
 
 Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties()
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b5369c3..6703669 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1489,7 +1489,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
                             DBG(fprintf (stderr, "graphic url: %s\n", OUStringToOString( aGraphicURL, RTL_TEXTENCODING_UTF8 ).getStr()));
                         } else if ( aPropName == "GraphicSize" )
                         {

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list