Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I1fee5879bbf0293dc765247f0587ce52c1570a3e

4 files changed, 31 insertions, 31 deletions

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e76c9f544462..a3dc009a9e38 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/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 },
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 8eaa6956aedb..ad06943463ba 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/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 );
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 532c1702d077..ca30f4563093 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/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 }
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index ea60a11b51af..f16c5a603385 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1953,7 +1953,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
     {
         if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 TransferableObjectDescriptor aDesc;
 
@@ -1982,7 +1982,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 try
                 {
@@ -2007,7 +2007,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
 
                 std::shared_ptr<GDIMetaFile> xMetaFile =
@@ -2028,7 +2028,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 std::shared_ptr<GDIMetaFile> xMetaFile =
                     m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( true );
@@ -2048,7 +2048,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 std::shared_ptr<GDIMetaFile> xMetaFile =
                     m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2083,7 +2083,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 std::shared_ptr<GDIMetaFile> xMetaFile =
                     m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2123,7 +2123,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 std::shared_ptr<GDIMetaFile> xMetaFile =
                     m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2147,7 +2147,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
         }
         else if ( aFlavor.MimeType == "image/png" )
         {
-            if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+            if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 std::shared_ptr<GDIMetaFile> xMetaFile =
                     m_pData->m_pObjectShell->GetPreviewMetaFile( true );
@@ -2192,41 +2192,41 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
     aFlavorSeq[0].MimeType =
         "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
     aFlavorSeq[0].HumanPresentableName =  "GDIMetaFile";
-    aFlavorSeq[0].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[0].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[1].MimeType =
         "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"";
     aFlavorSeq[1].HumanPresentableName = "GDIMetaFile";
-    aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[2].MimeType =
         "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ;
     aFlavorSeq[2].HumanPresentableName = "Enhanced Windows MetaFile";
-    aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[2].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[3].MimeType =
         "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
     aFlavorSeq[3].HumanPresentableName = "Windows MetaFile";
-    aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[3].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[4].MimeType =
         "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"";
     aFlavorSeq[4].HumanPresentableName = "Star Object Descriptor (XML)";
-    aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[4].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[5].MimeType =
         "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"";
     aFlavorSeq[5].HumanPresentableName = "Star Embed Source (XML)";
-    aFlavorSeq[5].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[5].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[6].MimeType =
         "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"";
     aFlavorSeq[6].HumanPresentableName = "Bitmap";
-    aFlavorSeq[6].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[6].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     aFlavorSeq[7].MimeType = "image/png";
     aFlavorSeq[7].HumanPresentableName = "PNG";
-    aFlavorSeq[7].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    aFlavorSeq[7].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     if ( nSuppFlavors == 10 )
     {
@@ -2256,17 +2256,17 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
 
     if ( aFlavor.MimeType == "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
         else if ( GraphicHelper::supportsMetaFileHandle_Impl()
           && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
@@ -2274,7 +2274,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
         else if ( GraphicHelper::supportsMetaFileHandle_Impl()
           && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get())
@@ -2282,22 +2282,22 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
     else if ( aFlavor.MimeType == "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
     else if ( aFlavor.MimeType == "image/png" )
     {
-        if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
+        if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             return sal_True;
     }
 
@@ -3701,7 +3701,7 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat
     datatransfer::DataFlavor aDataFlavor(
             OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
             OUString("GDIMetaFile"),
-            ::getCppuType( (const Sequence< sal_Int8 >*) NULL ) );
+            cppu::UnoType<Sequence< sal_Int8 >>::get() );
 
     embed::VisualRepresentation aVisualRepresentation;
     aVisualRepresentation.Data = getTransferData( aDataFlavor );