Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I1fee5879bbf0293dc765247f0587ce52c1570a3e

sfx2/source/control/bindings.cxx

@@ -1942,7 +1942,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
                     ::com::sun::star::uno::Any aAny = pBind->GetStatus().State;
                     ::com::sun::star::uno::Type pType = aAny.getValueType();
 
-                    if ( pType == ::getBooleanCppuType() )
+                    if ( pType == cppu::UnoType<bool>::get() )
                     {
                         bool bTemp = false;
                         aAny >>= bTemp ;

sfx2/source/control/querystatus.cxx

@@ -111,7 +111,7 @@ throw( RuntimeException, std::exception )
         m_eState = SfxItemState::DEFAULT;
         ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-        if ( pType == ::getBooleanCppuType() )
+        if ( pType == cppu::UnoType<bool>::get() )
         {
             bool bTemp = false;
             rEvent.State >>= bTemp ;

sfx2/source/dialog/templateinfodlg.cxx

@@ -96,15 +96,15 @@ void SfxTemplateInfoDlg::loadDocument(const OUString &rURL)
             bool b = true;
             uno::Sequence <beans::PropertyValue> aArgs( 4 );
             aArgs[0].Name = "Preview";
-            aArgs[0].Value.setValue( &b, ::getBooleanCppuType() );
+            aArgs[0].Value.setValue( &b, cppu::UnoType<bool>::get() );
             aArgs[1].Name = "ReadOnly";
-            aArgs[1].Value.setValue( &b, ::getBooleanCppuType() );
+            aArgs[1].Value.setValue( &b, cppu::UnoType<bool>::get() );
             aArgs[2].Name = "AsTemplate";    // prevents getting an empty URL with getURL()!
             aArgs[3].Name = "InteractionHandler";
             aArgs[3].Value <<= xInteractionHandler;
 
             b = false;
-            aArgs[2].Value.setValue( &b, ::getBooleanCppuType() );
+            aArgs[2].Value.setValue( &b, cppu::UnoType<bool>::get() );
             xDisp->dispatch( aURL, aArgs );
         }
     }

sfx2/source/doc/iframe.cxx

@@ -139,10 +139,10 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
 {
     static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] =
     {
-        { OUString("FrameIsAutoBorder"),    WID_FRAME_IS_AUTO_BORDER,   ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { OUString("FrameIsAutoScroll"),    WID_FRAME_IS_AUTO_SCROLL,   ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { OUString("FrameIsBorder"),        WID_FRAME_IS_BORDER,        ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
-        { OUString("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
+        { OUString("FrameIsAutoBorder"),    WID_FRAME_IS_AUTO_BORDER,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { OUString("FrameIsAutoScroll"),    WID_FRAME_IS_AUTO_SCROLL,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { OUString("FrameIsBorder"),        WID_FRAME_IS_BORDER,        cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { OUString("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE,cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
         { OUString("FrameMarginHeight"),    WID_FRAME_MARGIN_HEIGHT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
         { OUString("FrameMarginWidth"),     WID_FRAME_MARGIN_WIDTH,     cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
         { OUString("FrameName"),            WID_FRAME_NAME,             cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },

sfx2/source/doc/oleprops.cxx

@@ -954,7 +954,7 @@ bool SfxOleSection::SetAnyValue( sal_Int32 nPropId, const Any& rValue )
     ::com::sun::star::util::DateTime aApiDateTime;
     ::com::sun::star::util::Date aApiDate;
 
-    if( rValue.getValueType() == ::getBooleanCppuType() )
+    if( rValue.getValueType() == cppu::UnoType<bool>::get() )
         SetBoolValue( nPropId, ::comphelper::getBOOL( rValue ) );
     else if( rValue >>= nInt32 )
         SetInt32Value( nPropId, nInt32 );

sfx2/source/doc/plugin.cxx

@@ -72,7 +72,7 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
 {
     static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] =
     {
-        { OUString("PluginCommands"), WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0},
+        { OUString("PluginCommands"), WID_COMMANDS, cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), PROPERTY_UNBOUND, 0},
         { OUString("PluginMimeType"), WID_MIMETYPE, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
         { OUString("PluginURL"),      WID_URL     , cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }

sfx2/source/notify/eventsupplier.cxx

@@ -163,7 +163,7 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno
 
 uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException, std::exception )
 {
-    uno::Type aElementType = ::getCppuType( (const uno::Sequence < beans::PropertyValue > *)0 );
+    uno::Type aElementType = cppu::UnoType<uno::Sequence < beans::PropertyValue >>::get();
     return aElementType;
 }
 

sfx2/source/sidebar/Theme.cxx

@@ -831,7 +831,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType)
             return cppu::UnoType<sal_uInt32>::get();
 
         case PT_Paint:
-            return getCppuVoidType();
+            return cppu::UnoType<cppu::UnoVoidType>::get();
 
         case PT_Integer:
             return cppu::UnoType<sal_Int32>::get();
@@ -844,7 +844,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType)
 
         case PT_Invalid:
         default:
-            return getCppuVoidType();
+            return cppu::UnoType<cppu::UnoVoidType>::get();
     }
 }
 

sfx2/source/statbar/stbitem.cxx

@@ -257,12 +257,12 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == ::getVoidCppuType() )
+                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotID );
                     eState = SfxItemState::UNKNOWN;
                 }
-                else if ( pType == ::getBooleanCppuType() )
+                else if ( pType == cppu::UnoType<bool>::get() )
                 {
                     bool bTemp = false;
                     rEvent.State >>= bTemp ;

sfx2/source/toolbox/tbxitem.cxx

@@ -515,12 +515,12 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == ::getVoidCppuType() )
+                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotId );
                     eState = SfxItemState::UNKNOWN;
                 }
-                else if ( pType == ::getBooleanCppuType() )
+                else if ( pType == cppu::UnoType<bool>::get() )
                 {
                     bool bTemp = false;
                     rEvent.State >>= bTemp ;
@@ -1069,12 +1069,12 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == ::getVoidCppuType() )
+                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotId );
                     eState = SfxItemState::UNKNOWN;
                 }
-                else if ( pType == ::getBooleanCppuType() )
+                else if ( pType == cppu::UnoType<bool>::get() )
                 {
                     bool bTemp = false;
                     rEvent.State >>= bTemp ;