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

Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9

11 files changed, 52 insertions, 56 deletions

diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 28bbd27208df..ae784218a609 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1432,7 +1432,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
     {
         if(evt.PropertyName == FM_PROP_VALUE)
         {
-            if( evt.NewValue.getValueType() == ::getCppuType((Reference<io::XInputStream>*)0) )
+            if( evt.NewValue.getValueType() == cppu::UnoType<io::XInputStream>::get())
             {
                 Reference< io::XDataInputStream >  xStream(
                     *(const Reference< io::XInputStream > *)evt.NewValue.getValue(), UNO_QUERY );
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index b569eb1c1543..3eeacbb1e074 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -273,12 +273,12 @@ void BibFrameController_Impl::dispose() throw (::com::sun::star::uno::RuntimeExc
 
 void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    pImp->aLC.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+    pImp->aLC.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
 
 void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
+    pImp->aLC.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
 
 uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index ca0c8156be96..2b0c14792b01 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -138,11 +138,11 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
 Any IUnknownWrapper_Impl::queryInterface(const Type& t)
     throw (RuntimeException)
 {
-    if (t == getCppuType(static_cast<Reference<XDefaultMethod>*>( 0)) && !m_bHasDfltMethod )
+    if (t == cppu::UnoType<XDefaultMethod>::get() && !m_bHasDfltMethod )
         return Any();
-    if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty )
+    if (t == cppu::UnoType<XDefaultProperty>::get() && !m_bHasDfltProperty )
         return Any();
-    if ( ( t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) || t == getCppuType(static_cast<Reference<XAutomationInvocation>*>( 0)) ) && !m_spDispatch)
+    if ( ( t == cppu::UnoType<XInvocation>::get() || t == cppu::UnoType<XAutomationInvocation>::get() ) && !m_spDispatch)
         return Any();
     // XDirectInvocation seems to be an oracle replacement for XAutomationInvocation, however it is flawed esecially wrt. assumptions about whether to invoke a
     // Put or Get property, the implementation code has no business guessing that, it's up to the caller to decide that. Worse XDirectInvocation duplicates lots of code.
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 77006bf6432c..221e9de00f8a 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -64,8 +64,7 @@ ProviderOleWrapper_Impl::ProviderOleWrapper_Impl(const Reference<XMultiServiceFa
 
     if (xInt.is())
     {
-        Any a= xInt->queryInterface( ::getCppuType( reinterpret_cast<
-                                                  Reference< XBridgeSupplier2>* >(0)));
+        Any a= xInt->queryInterface( cppu::UnoType<XBridgeSupplier2>::get() );
         a >>= m_bridgeSupplier;
 
     }
@@ -202,8 +201,7 @@ OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl(  const Reference<XMultiS
 
     if (xInt.is())
     {
-        Any a= xInt->queryInterface( getCppuType(
-            reinterpret_cast< Reference<XBridgeSupplier2>*>(0)));
+        Any a= xInt->queryInterface( cppu::UnoType<XBridgeSupplier2>::get() );
         a >>= m_bridgeSupplier;
     }
 }
@@ -481,8 +479,7 @@ OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr):
 
     if (xInt.is())
     {
-        Any a= xInt->queryInterface(getCppuType(
-            reinterpret_cast<Reference<XBridgeSupplier2>*>(0)));
+        Any a= xInt->queryInterface(cppu::UnoType<XBridgeSupplier2>::get() );
         a >>= m_bridgeSupplier;
     }
 }
@@ -597,8 +594,7 @@ OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr):
 
     if (xInt.is())
     {
-        Any a= xInt->queryInterface( getCppuType(
-            reinterpret_cast< Reference<XBridgeSupplier2>*>(0)));
+        Any a= xInt->queryInterface( cppu::UnoType<XBridgeSupplier2>::get() );
         a >>= m_bridgeSupplier;
     }
 
@@ -644,8 +640,8 @@ Sequence< Type > SAL_CALL OleServer_Impl::getTypes( ) throw(RuntimeException)
         if( ! pCollection )
         {
             static OTypeCollection collection(
-                getCppuType(reinterpret_cast< Reference< XWeak>*>(0)),
-                getCppuType(reinterpret_cast< Reference< XTypeProvider>*>(0)) );
+                cppu::UnoType<XWeak>::get(),
+                cppu::UnoType<XTypeProvider>::get() );
             pCollection = &collection;
         }
     }
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 083d50284165..2f969834d7a9 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -706,7 +706,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
         }
         case TypeClass_STRUCT:
         {
-            if (rAny.getValueType() == getCppuType((Date*)0))
+            if (rAny.getValueType() == cppu::UnoType<Date>::get() )
             {
                 Date d;
                 if (rAny >>= d)
@@ -1572,7 +1572,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                     rAny.setValue( & var.bVal, cppu::UnoType<sal_Int8>::get());
                     break;
                 case VT_UI2:
-                    rAny.setValue( & var.uiVal, getCppuType( (sal_uInt16*)0));
+                    rAny.setValue( & var.uiVal, cppu::UnoType<cppu::UnoUnsignedShortType>::get() );
                     break;
                 case VT_UI4:
                     rAny.setValue( & var.ulVal, cppu::UnoType<sal_uInt32>::get());
@@ -1704,10 +1704,10 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
         {
         case VT_EMPTY:
         case VT_UNKNOWN:
-            desiredType = getCppuType((Reference<XInterface>*) 0);
+            desiredType = cppu::UnoType<XInterface>::get();
             break;
         case VT_DISPATCH:
-            desiredType = getCppuType((Reference<XInvocation>*) 0);
+            desiredType = cppu::UnoType<XInvocation>::get();
             break;
         default:
             desiredType = aType;
@@ -1811,7 +1811,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
     // If the object implements UNO interfaces then get the types.
     Sequence<Type> seqTypes = getImplementedInterfaces(spUnknown);
     if (seqTypes.getLength() == 0 &&
-        aType != VOID_TYPE && aType != getCppuType((Reference<XInvocation>*)0))
+        aType != VOID_TYPE && aType != cppu::UnoType<XInvocation>::get())
     {
         seqTypes = Sequence<Type>( & aType, 1);
     }
@@ -1847,7 +1847,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
     // we have a wrapper object
     //The wrapper implements already XInvocation and XInterface. If
     //param aType is void then the object is supposed to have XInvocation.
-     if (aType == getCppuType((Reference<XInvocation>*)0) ||
+     if (aType == cppu::UnoType<XInvocation>::get()||
          (aType == VOID_TYPE && seqTypes.getLength() == 0 ))
      {
          ret = xIntNewProxy->queryInterface(desiredType);
diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx
index 48920c79a9e2..c810e4c084f2 100644
--- a/extensions/source/plugin/base/multiplx.cxx
+++ b/extensions/source/plugin/base/multiplx.cxx
@@ -85,19 +85,19 @@ void MRCListenerMultiplexerHelper::disposeAndClear()
 void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type )
 {
     // add a listener to the source (peer)
-    if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0) )
+    if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get())
         rPeer->addWindowListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get())
         rPeer->addKeyListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get())
         rPeer->addFocusListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get())
         rPeer->addMouseListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get())
         rPeer->addMouseMotionListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get())
         rPeer->addPaintListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XTopWindowListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get())
     {
         Reference< ::com::sun::star::awt::XTopWindow >  xTop( rPeer, UNO_QUERY );
         if( xTop.is() )
@@ -113,19 +113,19 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st
 void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type )
 {
     // the last listener is removed, remove the listener from the source (peer)
-    if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0) )
+    if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get())
         rPeer->removeWindowListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get())
         rPeer->removeKeyListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get())
         rPeer->removeFocusListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get())
         rPeer->removeMouseListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get())
         rPeer->removeMouseMotionListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get())
         rPeer->removePaintListener( this );
-    else if( type == ::getCppuType((const Reference< ::com::sun::star::awt::XTopWindowListener >*)0) )
+    else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get())
     {
         Reference< ::com::sun::star::awt::XTopWindow >  xTop( rPeer, UNO_QUERY );
         if( xTop.is() )
@@ -172,7 +172,7 @@ void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::Event
 
 #define MULTIPLEX( InterfaceName, MethodName, EventName )                   \
 ::cppu::OInterfaceContainerHelper * pCont;                                          \
-pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< InterfaceName >*)0) );        \
+pCont = aListenerHolder.getContainer( cppu::UnoType<InterfaceName>::get());        \
 if( pCont )                                                                 \
 {                                                                           \
     ::cppu::OInterfaceIteratorHelper    aIt( *pCont );                              \
diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx
index fc19c0d20229..bceeaa61afb9 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -205,84 +205,84 @@ void PluginControl_Impl::setDesignMode( sal_Bool bOn )
 void PluginControl_Impl::addPaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removePaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::addWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removeWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::addFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removeFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::addKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removeKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::addMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removeMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0), l );
+    getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l );
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::removeMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l )
     throw( RuntimeException, std::exception )
 {
-    getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0), l );
+    getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l );
 }
 
 
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d052ea3a8f1d..97929ded6d83 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -304,7 +304,7 @@ namespace pcr
             if ( m_pHelper->isListEntrySink() )
             {
                 implAddPropertyDescription( aProperties, PROPERTY_LIST_BINDING,
-                    ::getCppuType( static_cast< Reference< XListEntrySource > * >( NULL ) ) );
+                    cppu::UnoType<XListEntrySource>::get() );
             }
         }
 
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index fc2279c82d57..38b2c3c7f2bf 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -103,9 +103,9 @@ namespace pcr
     Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, std::exception)
     {
         ::cppu::OTypeCollection aTypes(
-            ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ),
-            ::getCppuType( static_cast< Reference< XMultiPropertySet >* >(NULL) ),
-            ::getCppuType( static_cast< Reference< XFastPropertySet >* >(NULL) ),
+            cppu::UnoType<XPropertySet>::get(),
+            cppu::UnoType<XMultiPropertySet>::get(),
+            cppu::UnoType<XFastPropertySet>::get(),
             OPropertyBrowserController::getTypes());
         return aTypes.getTypes();
     }
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 04f9c1627687..4603b451d8b0 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -268,7 +268,7 @@ namespace pcr
         ::std::vector< Property > aProperties;
         if ( m_pHelper.get() )
         {
-            implAddPropertyDescription( aProperties, PROPERTY_SUBMISSION_ID, ::getCppuType( static_cast< Reference< submission::XSubmission > * >( NULL ) ) );
+            implAddPropertyDescription( aProperties, PROPERTY_SUBMISSION_ID, cppu::UnoType<submission::XSubmission>::get() );
             implAddPropertyDescription( aProperties, PROPERTY_XFORMS_BUTTONTYPE, ::cppu::UnoType<FormButtonType>::get() );
         }
         if ( aProperties.empty() )
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 1e02b3601b4c..36483086ee89 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -1237,7 +1237,7 @@ void SAL_CALL OComponent::methodStruct(const Property& aProp) throw( RuntimeExce
 
 Property SAL_CALL OComponent::retMethodStruct(void) throw( RuntimeException )
 {
-    Property a(L"OleTest_Property", 255, getCppuType( (Reference<XInterface>*)0), PropertyAttribute::MAYBEVOID |
+    Property a(L"OleTest_Property", 255, cppu::UnoType<XInterface>::get(), PropertyAttribute::MAYBEVOID |
         PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED |
         PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY |
         PropertyAttribute::MAYBEAMBIGUOUS | PropertyAttribute::MAYBEDEFAULT );
@@ -1246,7 +1246,7 @@ Property SAL_CALL OComponent::retMethodStruct(void) throw( RuntimeException )
 
 Property SAL_CALL OComponent::getAttrStruct(void) throw( RuntimeException)
 {
-    Property a(L"OleTest_Property", 255, getCppuType( (Reference<XInterface>*)0), PropertyAttribute::MAYBEVOID |
+    Property a(L"OleTest_Property", 255, cppu::UnoType<XInterface>::get(), PropertyAttribute::MAYBEVOID |
         PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED |
         PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY |
         PropertyAttribute::MAYBEAMBIGUOUS | PropertyAttribute::MAYBEDEFAULT );