summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-05-10 23:51:21 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-05-10 23:54:07 +0200
commitfa51b556800f332b311786770b3d6e57b65f615c (patch)
tree4218dbf7025f8d88550d941c2394c8c442324187 /ucb
parent2241dd8d83fa8a89502ad7985427c5c79d94ce21 (diff)
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part9
Change-Id: I82ed4a4868cb22566706ca0f4b1321e0d45016cf
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx4
-rw-r--r--ucb/source/core/ucbprops.cxx12
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx24
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx8
-rw-r--r--ucb/source/ucp/file/bc.cxx10
-rw-r--r--ucb/source/ucp/file/filrset.cxx4
-rw-r--r--ucb/source/ucp/file/prov.cxx6
-rw-r--r--ucb/source/ucp/file/shell.cxx34
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx10
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx4
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx18
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx22
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx10
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx32
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx10
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx24
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx6
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx24
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx28
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx38
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx28
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx38
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx6
25 files changed, 203 insertions, 203 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 5d4310929190..7cf70060b213 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -489,7 +489,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo(
{
Property& rMyProp = (*m_pProperties)[ nOrigProps - nDeleted ];
rMyProp.Name = m_aPropertyNameForFetchSize;
- rMyProp.Type = getCppuType( static_cast< const sal_Int32 * >( 0 ) );
+ rMyProp.Type = cppu::UnoType<sal_Int32>::get();
rMyProp.Attributes = PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT;
if( nFetchSize != -1 )
@@ -503,7 +503,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo(
{
Property& rMyProp = (*m_pProperties)[ nOrigProps - nDeleted + 1 ];
rMyProp.Name = m_aPropertyNameForFetchDirection;
- rMyProp.Type = getCppuType( static_cast< const sal_Bool * >( 0 ) );
+ rMyProp.Type = cppu::UnoType<sal_Bool>::get();
rMyProp.Attributes = PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT;
if( nFetchDirection != -1 )
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 120c6b80b6cd..2693fb6b7f75 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -61,31 +61,31 @@ struct PropertyTableEntry
static const com::sun::star::uno::Type& OUString_getCppuType()
{
- return getCppuType( static_cast< const OUString * >( 0 ) );
+ return cppu::UnoType<OUString>::get();
}
static const com::sun::star::uno::Type& sal_uInt16_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int16 * >( 0 ) );
+ return cppu::UnoType<sal_Int16>::get();
}
static const com::sun::star::uno::Type& sal_uInt32_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int32 * >( 0 ) );
+ return cppu::UnoType<sal_Int32>::get();
}
static const com::sun::star::uno::Type& sal_uInt64_getCppuType()
{
// ! uInt -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int64 * >( 0 ) );
+ return cppu::UnoType<sal_Int64>::get();
}
static const com::sun::star::uno::Type& enum_getCppuType()
{
// ! enum -> Int, because of Java !!!
- return getCppuType( static_cast< const sal_Int16 * >( 0 ) );
+ return cppu::UnoType<sal_Int16>::get();
}
static const com::sun::star::uno::Type& sal_Bool_getCppuType()
@@ -95,7 +95,7 @@ static const com::sun::star::uno::Type& sal_Bool_getCppuType()
static const com::sun::star::uno::Type& byte_getCppuType()
{
- return getCppuType( static_cast< const sal_Int8 * >( 0 ) );
+ return cppu::UnoType<sal_Int8>::get();
}
static const com::sun::star::uno::Type& Sequence_CrossReference_getCppuType()
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index a37606c92609..96a16390227d 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1448,31 +1448,31 @@ namespace cmis
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "ObjectId" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "TitleOnServer" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CreatableContentsInfo" ),
-1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "MediaType" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "CmisProperties" ),
-1, getCppuType( static_cast< const uno::Sequence< document::CmisProperty> * >( 0 ) ),
@@ -1523,13 +1523,13 @@ namespace cmis
-1, getCppuType( static_cast<ucb::InsertCommandArgument2 * >( 0 ) ) ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Mandatory CMIS-only commands
ucb::CommandInfo ( OUString( "checkout" ), -1, getCppuVoidType() ),
ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, getCppuVoidType() ),
ucb::CommandInfo ( OUString( "checkIn" ), -1,
- getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo ( OUString( "updateProperties" ), -1, getCppuVoidType() ),
ucb::CommandInfo
( OUString( "getAllVersions" ),
@@ -1539,10 +1539,10 @@ namespace cmis
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps = SAL_N_ELEMENTS( aCommandInfoTable );
@@ -1829,7 +1829,7 @@ namespace cmis
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 116c4b270e96..3771e1a365da 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -221,7 +221,7 @@ namespace cmis
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
@@ -254,7 +254,7 @@ namespace cmis
// Optional standard commands
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
};
const int nProps = SAL_N_ELEMENTS(aCommandInfoTable);
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index d5fa68e05e0d..dfb94886835d 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -435,12 +435,12 @@ namespace ucb { namespace ucp { namespace ext
// Append all Core Properties.
xRow->appendString ( Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
ContentProvider::getArtificialNodeContentType() );
xRow->appendString ( Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
i_rTitle );
xRow->appendBoolean( Property( OUString("IsDocument"),
@@ -594,7 +594,7 @@ namespace ucb { namespace ucp { namespace ext
Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
@@ -612,7 +612,7 @@ namespace ucb { namespace ucp { namespace ext
Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
)
};
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index e444d31db0b5..3b59a3141fd1 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -398,7 +398,7 @@ BaseContent::execute( const Command& aCommand,
seq[0] = beans::Property(
OUString("CasePreservingURL"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( CommandId,seq );
OUString CasePreservingURL = xRow->getString(1);
@@ -507,7 +507,7 @@ BaseContent::getContentType()
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
bool IsDocument = xRow->getBoolean( 1 );
@@ -644,7 +644,7 @@ BaseContent::createNewContent(
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
IsDocument = xRow->getBoolean( 1 );
@@ -1101,7 +1101,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( nMyCommandIdentifier,seq );
bool IsDocument = xRow->getBoolean( 1 );
@@ -1170,7 +1170,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
Sequence< beans::Property > seq(1);
seq[0] = beans::Property( OUString("IsDocument"),
-1,
- getCppuType( static_cast< sal_Bool* >(0) ),
+ cppu::UnoType<sal_Bool>::get(),
0 );
Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index cdc668231a41..f499af010190 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -743,12 +743,12 @@ XResultSet_impl::getPropertySetInfo()
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Int32>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[0].Name = "IsRowCountFinal";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Bool>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
XPropertySetInfo_impl* p = new XPropertySetInfo_impl( m_pMyShell,
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 223d4c8ad720..ac5b6e4336aa 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -336,17 +336,17 @@ XPropertySetInfoImpl2::XPropertySetInfoImpl2()
{
m_seq[0] = Property( OUString("HostName"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::READONLY );
m_seq[1] = Property( OUString("HomeDirectory"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::READONLY );
m_seq[2] = Property( OUString("FileSystemNotation"),
-1,
- getCppuType( static_cast< sal_Int32* >( 0 ) ),
+ cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::READONLY );
}
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index e9d311182560..c5ac2ef43ec1 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -177,7 +177,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
Title,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -188,7 +188,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
MyProperty( true,
CasePreservingURL,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -200,7 +200,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsFolder,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -212,7 +212,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsDocument,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -223,7 +223,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsVolume,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -235,7 +235,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsRemoveable,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -246,7 +246,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsRemote,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -257,7 +257,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsCompactDisc,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -268,7 +268,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsFloppy,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -281,7 +281,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
true,
IsHidden,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -299,7 +299,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( false,
ContentType,
-1 ,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
aAny,
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -311,7 +311,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
DateModified,
-1 ,
- getCppuType( static_cast< util::DateTime* >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -321,7 +321,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
Size,
-1,
- getCppuType( static_cast< sal_Int64* >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -331,7 +331,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
IsReadOnly,
-1 ,
- getCppuType( static_cast< sal_Bool* >( 0 ) ),
+ cppu::UnoType<sal_Bool>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -376,7 +376,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_sCommandInfo[6].Name = "delete";
m_sCommandInfo[6].Handle = -1;
- m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) );
+ m_sCommandInfo[6].ArgType = cppu::UnoType<sal_Bool>::get();
m_sCommandInfo[7].Name = "insert";
m_sCommandInfo[7].Handle = -1;
@@ -384,7 +384,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_sCommandInfo[7].Name = "createNewContent";
m_sCommandInfo[7].Handle = -1;
- m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) );
+ m_sCommandInfo[7].ArgType = cppu::UnoType<ucb::ContentInfo>::get();
if(m_bWithConfig)
{
@@ -3019,7 +3019,7 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::BOUND );
seq[0].Properties = props;
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 24c63ffbad2f..5d3a70e1156f 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -661,7 +661,7 @@ FTPContent::queryCreatableContentsInfo_Static( )
props[0] = Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
PropertyAttribute::MAYBEVOID
| PropertyAttribute::BOUND );
seq[0].Properties = props;
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index ce8bbc1b910a..8e4aa4e993bf 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -43,7 +43,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -64,21 +64,21 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
// | beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "DateCreated" ),
-1,
- getCppuType( static_cast< util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -165,7 +165,7 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
};
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index d37f99128b76..a1ed5f7aab07 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -504,12 +504,12 @@ ResultSetBase::getPropertySetInfo()
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
seq[0].Handle = -1;
- seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
+ seq[0].Type = cppu::UnoType<sal_Int32>::get();
seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[1].Name = "IsRowCountFinal";
seq[1].Handle = -1;
- seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
+ seq[1].Type = cppu::UnoType<sal_Bool>::get();
seq[1].Attributes = beans::PropertyAttribute::READONLY;
//t
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 62e44d33fcf9..adba80d8fae0 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1116,7 +1116,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
@@ -1236,19 +1236,19 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsVolume" ),
-1, getCppuBooleanType(),
@@ -1295,18 +1295,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc
-1, getCppuBooleanType() ),
ucb::CommandInfo
( OUString( "insert" ),
- -1, getCppuType( static_cast<ucb::InsertCommandArgument * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps = sizeof (aCommandInfoTable) / sizeof (aCommandInfoTable[0]);
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 80d20502f470..8f82888d124f 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -445,7 +445,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
props[0] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< OUString* >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
@@ -1301,7 +1301,7 @@ uno::Sequence< beans::Property > Content::getProperties(
{
static const beans::Property aGenericProperties[] = {
beans::Property( OUString( "ContentType" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsDocument" ),
-1, getCppuBooleanType(),
@@ -1310,21 +1310,21 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
- -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+ -1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
// Optional ...
beans::Property( OUString( "DateCreated" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateModified" ),
- -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ -1, cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
// FIXME: Too expensive for now (?)
// beans::Property( OUString( "MediaType" ),
-// -1, getCppuType( static_cast< const OUString * >( 0 ) ),
+// -1, cppu::UnoType<OUString>::get(),
// beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Size" ),
- -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ -1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
@@ -1373,18 +1373,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
-1, getCppuBooleanType() ),
ucb::CommandInfo
( OUString( "insert" ),
- -1, getCppuType( static_cast<ucb::InsertCommandArgument * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
ucb::CommandInfo
( OUString( "open" ),
- -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
// Folder Only, omitted if not a folder
ucb::CommandInfo
( OUString( "transfer" ),
- -1, getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
+ -1, cppu::UnoType<ucb::TransferInfo>::get() ),
ucb::CommandInfo
( OUString( "createNewContent" ),
- -1, getCppuType( static_cast<ucb::ContentInfo * >( 0 ) ) )
+ -1, cppu::UnoType<ucb::ContentInfo>::get() )
};
const int nProps
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 001b995a8c2d..a99d4b63f13b 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1005,14 +1005,14 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
xRow->appendString (
beans::Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getContentType() );
xRow->appendString (
beans::Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
// @@@ Might actually be read-only!
beans::PropertyAttribute::BOUND ),
rData.getTitle() );
@@ -1873,7 +1873,7 @@ HierarchyContentProperties::getCreatableContentsInfo() const
aFolderProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aSeq.getArray()[ 0 ].Properties = aFolderProps;
@@ -1885,12 +1885,12 @@ HierarchyContentProperties::getCreatableContentsInfo() const
aLinkProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aLinkProps.getArray()[ 1 ] = beans::Property(
OUString("TargetURL"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
aSeq.getArray()[ 1 ].Properties = aLinkProps;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index b5365842b635..67bdb2d1cc1d 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -104,7 +104,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -125,7 +125,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -135,7 +135,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "TargetURL" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -163,7 +163,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -184,7 +184,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -193,7 +193,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "TargetURL" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -229,7 +229,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -250,7 +250,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -281,7 +281,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -302,7 +302,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -342,7 +342,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -363,7 +363,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -596,12 +596,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
@@ -705,12 +705,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 2c703b057c0f..2b85a29025ec 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -109,7 +109,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
aProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
uno::Sequence< ucb::ContentInfo > aSeq( 2 );
@@ -924,7 +924,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.aContentType );
@@ -932,7 +932,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
rData.aTitle );
xRow->appendBoolean(
@@ -965,7 +965,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("MediaType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
rData.aMediaType );
@@ -976,7 +976,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Size"),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.nSize );
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index a45e58073bb8..2e81cb493a3a 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -105,7 +105,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -126,7 +126,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -136,7 +136,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -177,7 +177,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -198,7 +198,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -207,7 +207,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
@@ -242,7 +242,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -263,7 +263,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -272,13 +272,13 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -375,7 +375,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
),
// New commands
@@ -454,7 +454,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
),
// New commands
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 683f0cf175a1..74e04233ec8f 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1037,7 +1037,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendString (
beans::Property( OUString("ContentType"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getContentType() );
@@ -1047,7 +1047,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendString (
beans::Property( OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
// Title is read-only for root and documents.
beans::PropertyAttribute::BOUND |
( ( eType == ROOT ) || ( eType == DOCUMENT )
@@ -2943,7 +2943,7 @@ ContentProperties::getCreatableContentsInfo() const
aProps.getArray()[ 0 ] = beans::Property(
OUString("Title"),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
#ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index f01458181026..5e0cce07f5bd 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -112,7 +112,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -133,7 +133,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -170,7 +170,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -191,7 +191,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
),
@@ -236,7 +236,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -257,7 +257,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -305,7 +305,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -326,7 +326,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -537,12 +537,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
@@ -598,12 +598,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
+ cppu::UnoType<ucb::TransferInfo>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
+ cppu::UnoType<ucb::ContentInfo>::get()
)
// New commands
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index b37b4e97b6e2..c9f14f0d8668 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -309,23 +309,23 @@ static OUString decodeValue( const OUString & rValue )
// static
bool UCBDeadPropertyValue::supportsType( const uno::Type & rType )
{
- if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( ( rType != cppu::UnoType<OUString>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int32>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int16>::get() )
&&
( rType != getCppuBooleanType() )
&&
( rType != getCppuCharType() )
&&
- ( rType != getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int8>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int64>::get() )
&&
- ( rType != getCppuType( static_cast< const float * >( 0 ) ) )
+ ( rType != cppu::UnoType<float>::get() )
&&
- ( rType != getCppuType( static_cast< const double * >( 0 ) ) ) )
+ ( rType != cppu::UnoType<double>::get() ) )
{
return false;
}
@@ -430,13 +430,13 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
OUString aStringValue;
OUString aStringType;
- if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( rType == cppu::UnoType<OUString>::get() )
{
// string
rInData >>= aStringValue;
aStringType = aTypeString;
}
- else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int32>::get() )
{
// long
sal_Int32 nValue = 0;
@@ -444,7 +444,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeLong;
}
- else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int16>::get() )
{
// short
sal_Int32 nValue = 0;
@@ -468,7 +468,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString( cValue );
aStringType = aTypeChar;
}
- else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int8>::get() )
{
// byte
sal_Int8 nValue = 0;
@@ -476,7 +476,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString( sal_Unicode( nValue ) );
aStringType = aTypeByte;
}
- else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int64>::get() )
{
// hyper
sal_Int64 nValue = 0;
@@ -484,7 +484,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeHyper;
}
- else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<float>::get() )
{
// float
float nValue = 0;
@@ -492,7 +492,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeFloat;
}
- else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<double>::get() )
{
// double
double nValue = 0;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 5c45dd73d586..8d040ce38ae6 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -81,7 +81,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -105,7 +105,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
// Optional UCB properties.
@@ -114,7 +114,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "DateCreated" ),
-1,
- getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -122,7 +122,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "DateModified" ),
-1,
- getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -130,7 +130,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -138,7 +138,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -146,7 +146,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "BaseURI" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -166,7 +166,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::CREATIONDATE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -174,14 +174,14 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::DISPLAYNAME,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
m_pProps->insert(
beans::Property(
DAVProperties::GETCONTENTLANGUAGE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -189,7 +189,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETCONTENTLENGTH,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -197,7 +197,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETCONTENTTYPE ,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -205,7 +205,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETETAG,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -213,7 +213,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETLASTMODIFIED,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -230,7 +230,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::RESOURCETYPE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -256,7 +256,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::EXECUTABLE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
}
}
@@ -281,7 +281,7 @@ bool ContentProvider::getProperty(
rProp = beans::Property(
rPropName,
- 1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
}
@@ -625,14 +625,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) );
+ cppu::UnoType<ucb::TransferInfo>::get() );
nPos++;
aCmdInfo[ nPos ] =
ucb::CommandInfo(
OUString(
"createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) );
+ cppu::UnoType<ucb::ContentInfo>::get() );
nPos++;
}
else
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index ab0a05902fab..20d8c8a363c7 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -322,23 +322,23 @@ static OUString decodeValue( const OUString & rValue )
// static
bool UCBDeadPropertyValue::supportsType( const uno::Type & rType )
{
- if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( ( rType != cppu::UnoType<OUString>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int32>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int16>::get() )
&&
( rType != getCppuBooleanType() )
&&
( rType != getCppuCharType() )
&&
- ( rType != getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int8>::get() )
&&
- ( rType != getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ ( rType != cppu::UnoType<sal_Int64>::get() )
&&
- ( rType != getCppuType( static_cast< const float * >( 0 ) ) )
+ ( rType != cppu::UnoType<float>::get() )
&&
- ( rType != getCppuType( static_cast< const double * >( 0 ) ) ) )
+ ( rType != cppu::UnoType<double>::get() ) )
{
return false;
}
@@ -445,13 +445,13 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
OUString aStringValue;
OUString aStringType;
- if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) )
+ if ( rType == cppu::UnoType<OUString>::get() )
{
// string
rInData >>= aStringValue;
aStringType = aTypeString;
}
- else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int32>::get() )
{
// long
sal_Int32 nValue = 0;
@@ -459,7 +459,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeLong;
}
- else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int16>::get() )
{
// short
sal_Int32 nValue = 0;
@@ -483,7 +483,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString( cValue );
aStringType = aTypeChar;
}
- else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int8>::get() )
{
// byte
sal_Int8 nValue = 0;
@@ -491,7 +491,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString( sal_Unicode( nValue ) );
aStringType = aTypeByte;
}
- else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<sal_Int64>::get() )
{
// hyper
sal_Int64 nValue = 0;
@@ -499,7 +499,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeHyper;
}
- else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<float>::get() )
{
// float
float nValue = 0;
@@ -507,7 +507,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeFloat;
}
- else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) )
+ else if ( rType == cppu::UnoType<double>::get() )
{
// double
double nValue = 0;
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index ce926ffce3db..a68231e082fb 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -65,7 +65,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -89,7 +89,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "Title" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
// Optional UCB properties.
@@ -98,7 +98,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "DateCreated" ),
-1,
- getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -106,7 +106,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "DateModified" ),
-1,
- getCppuType( static_cast< const util::DateTime * >( 0 ) ),
+ cppu::UnoType<util::DateTime>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -114,7 +114,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -122,7 +122,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "Size" ),
-1,
- getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
+ cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -130,7 +130,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "BaseURI" ),
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -150,7 +150,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::CREATIONDATE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -158,14 +158,14 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::DISPLAYNAME,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
m_pProps->insert(
beans::Property(
DAVProperties::GETCONTENTLANGUAGE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -173,7 +173,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETCONTENTLENGTH,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -181,7 +181,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETCONTENTTYPE ,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -189,7 +189,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETETAG,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -197,7 +197,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::GETLASTMODIFIED,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -214,7 +214,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::RESOURCETYPE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -232,7 +232,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::EXECUTABLE,
-1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ) );
}
}
@@ -257,7 +257,7 @@ bool ContentProvider::getProperty(
rProp = beans::Property(
rPropName,
- 1,
- getCppuType( static_cast< const OUString * >( 0 ) ),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND );
}
@@ -597,14 +597,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "transfer" ),
-1,
- getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) );
+ cppu::UnoType<ucb::TransferInfo>::get() );
nPos++;
aCmdInfo[ nPos ] =
ucb::CommandInfo(
OUString(
"createNewContent" ),
-1,
- getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) );
+ cppu::UnoType<ucb::ContentInfo>::get() );
nPos++;
}
else
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index e9a1a18b86da..9ecffc2d8727 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -930,7 +930,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput,
beans::Property* pProps = aProps.getArray();
pProps[ 0 ].Name = "Title";
pProps[ 0 ].Handle = -1; // Important!
-/**/ pProps[ 0 ].Type = getCppuType(static_cast< OUString * >(0));
+/**/ pProps[ 0 ].Type = cppu::UnoType<OUString>::get();
// HACK for sorting...
pProps[ 1 ].Name = "DateCreated";
pProps[ 1 ].Handle = -1; // Important!
@@ -938,7 +938,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput,
pProps[ 2 ].Handle = -1; // Important!
pProps[ 3 ].Name = "IsFolder";
pProps[ 3 ].Handle = -1; // Important!
-/**/ pProps[ 3 ].Type = getCppuType(static_cast< sal_Bool * >(0));
+/**/ pProps[ 3 ].Type = cppu::UnoType<sal_Bool>::get();
// HACK for sorting...
pProps[ 4 ].Name = "IsDocument";
pProps[ 4 ].Handle = -1; // Important!
@@ -1379,7 +1379,7 @@ uno::Any UcbContent::getPropertyValue( const OUString& rName )
OUString UcbContent::getStringPropertyValue( const OUString& rName )
{
uno::Any aAny = getPropertyValue( rName );
- if ( aAny.getValueType() == getCppuType( (const OUString *)0 ) )
+ if ( aAny.getValueType() == cppu::UnoType<OUString>::get() )
{
const OUString aValue(
* static_cast< const OUString * >( aAny.getValue() ) );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 08:43:38 +0000