Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I1ee944679d509929e47218f88b6fe4be4905a202

embeddedobj/source/commonembedding/visobj.cxx

@@ -207,7 +207,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
         datatransfer::DataFlavor aDataFlavor(
                 OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
                 OUString( "GDIMetaFile" ),
-                ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
+                cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
         if( xTransferable->isDataFlavorSupported( aDataFlavor ))
         {

embeddedobj/source/msole/olecomponent.cxx

@@ -192,27 +192,27 @@ struct OleComponentNative_Impl {
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ),
             OUString( "Windows Enhanced Metafile" ),
-            getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
         m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
             OUString( "Windows Metafile" ),
-            getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
         m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
             OUString( "Bitmap" ),
-            getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
         m_aSupportedGraphFormats[3] = datatransfer::DataFlavor(
             OUString( "image/png" ),
             OUString( "PNG" ),
-            getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
             OUString( "GDIMetafile" ),
-            getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
     }
 
     void AddSupportedFormat( const FORMATETC& aFormatEtc );
@@ -283,7 +283,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
     sal_Bool bAnyIsReady = sal_False;
 
     // try to convert data from Medium format to specified Flavor format
-    if ( aFlavor.DataType == getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) )
+    if ( aFlavor.DataType == cppu::UnoType<uno::Sequence< sal_Int8 >>::get() )
     {
         // first the GDI-metafile must be generated
 
@@ -356,7 +356,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
             for ( sal_Int32 nInd = 0; nInd < m_aSupportedGraphFormats.getLength(); nInd++ )
                  if ( aFlavor.MimeType.match( m_aSupportedGraphFormats[nInd].MimeType )
                   && aFlavor.DataType == m_aSupportedGraphFormats[nInd].DataType
-                  && aFlavor.DataType == getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) )
+                  && aFlavor.DataType == cppu::UnoType<uno::Sequence< sal_Int8 >>::get() )
             {
                 bAnyIsReady = ConvertBufferToFormat( ( void* )pBuf.get(), nBufSize, aFormat, aResult );
                 break;

embeddedobj/source/msole/olevisual.cxx

@@ -57,7 +57,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
         aVisualRepr.Flavor = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
             OUString( "Bitmap" ),
-            ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
     }
     else
     {
@@ -65,7 +65,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
         aVisualRepr.Flavor = datatransfer::DataFlavor(
             OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
             OUString( "Windows Metafile" ),
-            ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
+            cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
     }
 
     sal_Int32 nStreamLength = (sal_Int32)xSeekable->getLength();
@@ -358,7 +358,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
             datatransfer::DataFlavor aDataFlavor(
                     OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
                     OUString( "Windows Metafile" ),
-                    ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
+                    cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
             aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor );
             aVisualRepr.Flavor = aDataFlavor;

embeddedobj/source/msole/xdialogcreator.cxx

@@ -253,7 +253,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
                     datatransfer::DataFlavor aFlavor(
                         OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
                         OUString( "Image WMF" ),
-                        getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) );
+                        cppu::UnoType<uno::Sequence< sal_Int8 >>::get() );
 
                     aObjectInfo.Options.realloc( 2 );
                     aObjectInfo.Options[0].Name = "Icon";