From ac76cc7e605b1bc9c0ff8e24d0b9995a8247074e Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 23 May 2014 22:11:27 +0200 Subject: Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part20 Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68 --- sot/source/base/exchange.cxx | 6 +++--- sot/source/unoolestorage/xolesimplestorage.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sot/source') diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index bfd29d6d93d1..084b1b57c1e9 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -61,7 +61,7 @@ namespace static const DataFlavorRepresentation aInstance[] = { /* 0 SOT_FORMAT_SYSTEM_START*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - /* 1 SOT_FORMAT_STRING*/ { "text/plain;charset=utf-16", "Text", &::getCppuType( (const OUString*) 0 ) }, + /* 1 SOT_FORMAT_STRING*/ { "text/plain;charset=utf-16", "Text", &cppu::UnoType::get()}, /* 2 SOT_FORMAT_BITMAP*/ { "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 3 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 4 SOT_FORMAT_PRIVATE*/ { "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, @@ -261,7 +261,7 @@ sal_uLong SotExchange::RegisterFormatName( const OUString& rName ) pNewFlavor->MimeType = rName; pNewFlavor->HumanPresentableName = rName; - pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 ); + pNewFlavor->DataType = cppu::UnoType::get(); rL.push_back( pNewFlavor ); @@ -296,7 +296,7 @@ sal_uLong SotExchange::RegisterFormatMimeType( const OUString& rMimeType ) pNewFlavor->MimeType = rMimeType; pNewFlavor->HumanPresentableName = rMimeType; - pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 ); + pNewFlavor->DataType = cppu::UnoType::get(); rL.push_back( pNewFlavor ); diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 12fcd50141e3..1e8ba5027f9e 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -597,7 +597,7 @@ uno::Type SAL_CALL OLESimpleStorage::getElementType() if ( m_bDisposed ) throw lang::DisposedException(); - return getCppuType( (const uno::Reference< io::XInputStream >*)NULL ); + return cppu::UnoType::get(); } -- cgit