summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:39:02 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:39:02 +0200
commite78a3bfdc815210145e717db459a90f50f218ea8 (patch)
treeb33b8bf1341e8a33455a480cfe65260a265a261c /embeddedobj
parentc047451f8a7d2878a2b8be39817105c3d362af0e (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I1ee944679d509929e47218f88b6fe4be4905a202
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/visobj.cxx2
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx14
-rw-r--r--embeddedobj/source/msole/olevisual.cxx6
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx2
4 files changed, 12 insertions, 12 deletions
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 4f42bb0011c9..cd16ffb61052 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/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 ))
{
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e57768c0ce0e..edafa43b3fa0 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/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;
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 93eaf15a83c4..cb129871f512 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/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;
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 3e9eed92ce71..1f425d6d7770 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/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";