summaryrefslogtreecommitdiff
path: root/ucb/source/ucp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:42:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:42:49 +0200
commit018e85387e1ed62ab8188ad4cb0728ee2a0a797c (patch)
treede497dd3ec2371ebf5e6cdd9732f203938718022 /ucb/source/ucp
parentf785d167b99f0f39c1d3b9424c327eaf0383d0d2 (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I8d1a4fda1cdd679f20de37271f7b832da4fb0c9a
Diffstat (limited to 'ucb/source/ucp')
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx36
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.cxx14
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx18
-rw-r--r--ucb/source/ucp/file/filrow.cxx2
-rw-r--r--ucb/source/ucp/file/shell.cxx10
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx21
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.cxx6
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx26
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx24
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx6
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx109
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx2
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx13
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx74
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx6
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx93
-rw-r--r--ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx6
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx8
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx35
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx8
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx30
21 files changed, 235 insertions, 312 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 1fc045a5ac4b..adcd6b4c19f8 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1508,10 +1508,10 @@ namespace cmis
static const beans::Property aGenericProperties[] =
{
beans::Property( OUString( "IsDocument" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsFolder" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
-1, cppu::UnoType<OUString>::get(),
@@ -1523,7 +1523,7 @@ namespace cmis
-1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
-1, cppu::UnoType<util::DateTime>::get(),
@@ -1535,25 +1535,25 @@ namespace cmis
-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 ) ),
+ -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "MediaType" ),
-1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "CmisProperties" ),
- -1, getCppuType( static_cast< const uno::Sequence< document::CmisProperty> * >( 0 ) ),
+ -1, cppu::UnoType<uno::Sequence< document::CmisProperty>>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsVersionable" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CanCheckOut" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CanCancelCheckOut" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CanCheckIn" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
};
@@ -1569,21 +1569,21 @@ namespace cmis
// Required commands
ucb::CommandInfo
( OUString( "getCommandInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertySetInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
ucb::CommandInfo
( OUString( "setPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
// Optional standard commands
ucb::CommandInfo
( OUString( "delete" ),
- -1, getCppuBooleanType() ),
+ -1, cppu::UnoType<bool>::get() ),
ucb::CommandInfo
( OUString( "insert" ),
-1, cppu::UnoType<ucb::InsertCommandArgument2>::get() ),
@@ -1592,14 +1592,14 @@ namespace cmis
-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( "checkout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+ ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo ( OUString( "checkIn" ), -1,
cppu::UnoType<ucb::TransferInfo>::get() ),
- ucb::CommandInfo ( OUString( "updateProperties" ), -1, getCppuVoidType() ),
+ ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getAllVersions" ),
- -1, getCppuType( static_cast<uno::Sequence< document::CmisVersion > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ),
// Folder Only, omitted if not a folder
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index f140a15725ff..bccca5a5cfac 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -243,16 +243,16 @@ namespace cmis
static const beans::Property aGenericProperties[] =
{
beans::Property( OUString( "IsDocument" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsFolder" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
-1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
};
@@ -268,16 +268,16 @@ namespace cmis
// Required commands
ucb::CommandInfo
( OUString( "getCommandInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertySetInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
ucb::CommandInfo
( OUString( "setPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
// Optional standard commands
ucb::CommandInfo
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 96d05e18d391..59a827ddd49e 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -445,12 +445,12 @@ namespace ucb { namespace ucp { namespace ext
i_rTitle );
xRow->appendBoolean( Property( OUString("IsDocument"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
false );
xRow->appendBoolean( Property( OUString("IsFolder"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
true );
}
@@ -554,24 +554,22 @@ namespace ucb { namespace ucp { namespace ext
CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< Sequence< Property > * >( 0 ) )
+ cppu::UnoType<Sequence< Property >>::get()
),
CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast< Sequence< PropertyValue > * >( 0 ) )
+ cppu::UnoType<Sequence< PropertyValue >>::get()
)
// Optional standard commands
@@ -600,13 +598,13 @@ namespace ucb { namespace ucp { namespace ext
Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index a09fdf451d03..80828ed6f772 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -56,7 +56,7 @@ bool convert( shell* pShell,
if( rValue.hasValue() )
{
uno::Any aConvertedValue
- = xConverter->convertTo( rValue,getCppuType( static_cast< const _type_* >(0) ) );
+ = xConverter->convertTo( rValue,cppu::UnoType<_type_>::get() );
no_success = ! ( aConvertedValue >>= aReturn );
}
else
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 36eb82d9dae0..8b9c7001aee6 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -342,7 +342,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
m_aDefaultProperties.insert( MyProperty( true,
CreatableContentsInfo,
-1 ,
- getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
uno::Any(),
beans::PropertyState_DEFAULT_VALUE,
beans::PropertyAttribute::MAYBEVOID
@@ -352,19 +352,19 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
// Commands
m_sCommandInfo[0].Name = "getCommandInfo";
m_sCommandInfo[0].Handle = -1;
- m_sCommandInfo[0].ArgType = getCppuVoidType();
+ m_sCommandInfo[0].ArgType = cppu::UnoType<cppu::UnoVoidType>::get();
m_sCommandInfo[1].Name = "getPropertySetInfo";
m_sCommandInfo[1].Handle = -1;
- m_sCommandInfo[1].ArgType = getCppuVoidType();
+ m_sCommandInfo[1].ArgType = cppu::UnoType<cppu::UnoVoidType>::get();
m_sCommandInfo[2].Name = "getPropertyValues";
m_sCommandInfo[2].Handle = -1;
- m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) );
+ m_sCommandInfo[2].ArgType = cppu::UnoType<uno::Sequence< beans::Property >>::get();
m_sCommandInfo[3].Name = "setPropertyValues";
m_sCommandInfo[3].Handle = -1;
- m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) );
+ m_sCommandInfo[3].ArgType = cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get();
m_sCommandInfo[4].Name = "open";
m_sCommandInfo[4].Handle = -1;
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 8b6cb3fed130..3446b3a4ea51 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -50,14 +50,14 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -85,7 +85,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
beans::Property(
OUString( "IsReadOnly" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -93,8 +93,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType(
- static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -126,24 +125,22 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -158,7 +155,7 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "createNewContent" ),
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 94837e4a3f18..6e7d15e036b7 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -91,10 +91,8 @@ FTPContentIdentifier::getTypes(
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType(
- static_cast<Reference<XTypeProvider>*>(0)),
- getCppuType(
- static_cast<Reference<XContentIdentifier>*>(0)));
+ cppu::UnoType<XTypeProvider>::get(),
+ cppu::UnoType<XContentIdentifier>::get());
pCollection = &collection;
}
}
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 59217807b5bb..c2ead85c4d49 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1256,16 +1256,16 @@ uno::Sequence< beans::Property > Content::getProperties(
static const beans::Property aGenericProperties[] =
{
beans::Property( OUString( "IsDocument" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsFolder" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
-1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND ),
beans::Property( OUString( "IsReadOnly" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "DateCreated" ),
-1, cppu::UnoType<util::DateTime>::get(),
@@ -1277,19 +1277,19 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsVolume" ),
- -1, getCppuBooleanType(),
+ 1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsCompactDisc" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsRemoveable" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsHidden" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CreatableContentsInfo" ),
- -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY )
};
@@ -1304,21 +1304,21 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc
// Required commands
ucb::CommandInfo
( OUString( "getCommandInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertySetInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
ucb::CommandInfo
( OUString( "setPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
// Optional standard commands
ucb::CommandInfo
( OUString( "delete" ),
- -1, getCppuBooleanType() ),
+ -1, cppu::UnoType<bool>::get() ),
ucb::CommandInfo
( OUString( "insert" ),
-1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index d1597f4e93af..14fade31f1cd 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -1304,10 +1304,10 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsDocument" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsFolder" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "Title" ),
-1, cppu::UnoType<OUString>::get(),
@@ -1327,19 +1327,19 @@ uno::Sequence< beans::Property > Content::getProperties(
-1, cppu::UnoType<sal_Int64>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsReadOnly" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsVolume" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsCompactDisk" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "IsHidden" ),
- -1, getCppuBooleanType(),
+ -1, cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
beans::Property( OUString( "CreatableContentsInfo" ),
- -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY )
};
@@ -1356,21 +1356,21 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Required commands
ucb::CommandInfo
( OUString( "getCommandInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertySetInfo" ),
- -1, getCppuVoidType() ),
+ -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
ucb::CommandInfo
( OUString( "getPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
ucb::CommandInfo
( OUString( "setPropertyValues" ),
- -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+ -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
// Optional standard commands
ucb::CommandInfo
( OUString( "delete" ),
- -1, getCppuBooleanType() ),
+ -1, cppu::UnoType<bool>::get() ),
ucb::CommandInfo
( OUString( "insert" ),
-1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 8f3b1237204b..63da66520a4f 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1019,14 +1019,14 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
xRow->appendBoolean(
beans::Property( OUString("IsDocument"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getIsDocument() );
xRow->appendBoolean(
beans::Property( OUString("IsFolder"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getIsFolder() );
@@ -1043,7 +1043,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
beans::Property(
OUString("CreatableContentsInfo"),
-1,
- getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
uno::makeAny( rData.getCreatableContentsInfo() ) );
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 564bafe3af70..f646a18dd3b3 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -111,14 +111,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -143,8 +143,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY )
@@ -170,14 +169,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -200,8 +199,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY )
@@ -236,14 +234,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -261,8 +259,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY )
@@ -288,14 +285,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -312,8 +309,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY )
@@ -349,14 +345,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -374,8 +370,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY )
@@ -411,25 +406,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
)
// Optional standard commands
@@ -451,25 +443,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -477,12 +466,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
)
// New commands
@@ -509,25 +498,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -553,25 +539,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -579,12 +562,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -626,25 +609,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -670,25 +650,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 325841d232ae..36a714815b71 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -463,7 +463,7 @@ HierarchyDataSource::createInstanceWithArguments(
}
else if ( aProp.Name == CFGPROPERTY_LAZYWRITE )
{
- if ( aProp.Value.getValueType() == getCppuBooleanType() )
+ if ( aProp.Value.getValueType() == cppu::UnoType<bool>::get() )
{
bHasLazyWriteProp = true;
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index d51af504df8e..a6e2c19fd611 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -939,7 +939,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("IsDocument"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.bIsDocument );
@@ -947,7 +947,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("IsFolder"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.bIsFolder );
@@ -955,8 +955,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("CreatableContentsInfo"),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
uno::makeAny(
@@ -985,7 +984,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Compressed"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND ),
rData.bCompressed );
@@ -993,7 +992,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("Encrypted"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND ),
rData.bEncrypted );
}
@@ -1006,7 +1005,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("HasEncryptedEntries"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.bHasEncryptedEntries );
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index 54b4cbe1a2aa..f6a64ab492d1 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -112,14 +112,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -143,8 +143,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -154,7 +153,7 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "HasEncryptedEntries" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -184,14 +183,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -214,8 +213,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -249,14 +247,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -286,8 +284,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -297,13 +294,13 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "Compressed" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
),
beans::Property(
OUString( "Encrypted" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
)
};
@@ -336,26 +333,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -381,7 +374,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "flush" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
)
};
@@ -403,26 +396,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -430,12 +419,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -458,7 +447,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "flush" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
)
};
@@ -481,25 +470,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -507,12 +493,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "open" ),
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 44b261047dd0..d158135e0dc9 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1057,14 +1057,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendBoolean(
beans::Property( OUString("IsDocument"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getIsDocument() );
xRow->appendBoolean(
beans::Property( OUString("IsFolder"),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.getIsFolder() );
@@ -1072,7 +1072,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
beans::Property(
OUString("CreatableContentsInfo"),
-1,
- getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
uno::makeAny( rData.getCreatableContentsInfo() ) );
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index e4ae2068d94c..6c5fca976628 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -120,14 +120,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -144,8 +144,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -178,14 +177,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -202,8 +201,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -243,14 +241,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -268,8 +266,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -311,14 +308,14 @@ uno::Sequence< beans::Property > Content::getProperties(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -336,8 +333,7 @@ uno::Sequence< beans::Property > Content::getProperties(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
)
@@ -378,25 +374,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -404,7 +397,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -432,25 +425,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType< uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -458,12 +448,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -492,25 +482,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -518,12 +505,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType()
+ cppu::UnoType<bool>::get()
),
ucb::CommandInfo(
OUString( "insert" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "open" ),
@@ -562,25 +549,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
@@ -624,25 +608,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType()
+ cppu::UnoType<cppu::UnoVoidType>::get()
),
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType(
- static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::Property >>::get()
),
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType(
- static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) )
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
),
// Optional standard commands
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index cc64e8c33190..96838feaced1 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -143,10 +143,8 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
if ( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( static_cast<
- uno::Reference< lang::XTypeProvider > * >( 0 ) ),
- getCppuType( static_cast<
- uno::Reference< task::XInteractionPassword > * >( 0 ) ) );
+ cppu::UnoType<lang::XTypeProvider>::get(),
+ cppu::UnoType<task::XInteractionPassword>::get() );
pCollection = &collection;
}
}
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index c9f14f0d8668..a73776697525 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -315,9 +315,9 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType )
&&
( rType != cppu::UnoType<sal_Int16>::get() )
&&
- ( rType != getCppuBooleanType() )
+ ( rType != cppu::UnoType<bool>::get() )
&&
- ( rType != getCppuCharType() )
+ ( rType != cppu::UnoType<cppu::UnoCharType>::get() )
&&
( rType != cppu::UnoType<sal_Int8>::get() )
&&
@@ -452,7 +452,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeShort;
}
- else if ( rType == getCppuBooleanType() )
+ else if ( rType == cppu::UnoType<bool>::get() )
{
// boolean
bool bValue = false;
@@ -460,7 +460,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::boolean( bValue );
aStringType = aTypeBoolean;
}
- else if ( rType == getCppuCharType() )
+ else if ( rType == cppu::UnoType<cppu::UnoCharType>::get() )
{
// char
sal_Unicode cValue = 0;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 98ad9fcbf0b5..356e592cad33 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -89,7 +89,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -97,7 +97,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -155,8 +155,8 @@ bool ContentProvider::getProperty(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<
+ uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -221,8 +221,8 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::LOCKDISCOVERY,
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::Lock > * >( 0 ) ),
+ cppu::UnoType<
+ uno::Sequence< ucb::Lock >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -238,17 +238,14 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::SOURCE,
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::Link > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::Link >>::get(),
beans::PropertyAttribute::BOUND ) );
m_pProps->insert(
beans::Property(
DAVProperties::SUPPORTEDLOCK,
-1,
- getCppuType( static_cast<
- const uno::Sequence<
- ucb::LockEntry > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::LockEntry >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -527,24 +524,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
aCmdInfo[ 1 ] =
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
aCmdInfo[ 2 ] =
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType( static_cast<
- uno::Sequence< beans::Property > * >( 0 ) ) );
+ cppu::UnoType<uno::Sequence< beans::Property >>::get() );
aCmdInfo[ 3 ] =
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType( static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) ) );
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() );
// Optional standard commands
@@ -554,7 +549,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType() );
+ cppu::UnoType<bool>::get() );
aCmdInfo[ 5 ] =
ucb::CommandInfo(
OUString( "insert" ),
@@ -637,13 +632,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "lock" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
nPos++;
aCmdInfo[ nPos ] =
ucb::CommandInfo(
OUString( "unlock" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
nPos++;
}
return aCmdInfo;
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index a4b5dd526cde..a00ad35b6027 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -318,9 +318,9 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType )
&&
( rType != cppu::UnoType<sal_Int16>::get() )
&&
- ( rType != getCppuBooleanType() )
+ ( rType != cppu::UnoType<bool>::get() )
&&
- ( rType != getCppuCharType() )
+ ( rType != cppu::UnoType<cppu::UnoCharType>::get() )
&&
( rType != cppu::UnoType<sal_Int8>::get() )
&&
@@ -457,7 +457,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::number( nValue );
aStringType = aTypeShort;
}
- else if ( rType == getCppuBooleanType() )
+ else if ( rType == cppu::UnoType<bool>::get() )
{
// boolean
sal_Bool bValue = false;
@@ -465,7 +465,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
aStringValue = OUString::boolean( bValue );
aStringType = aTypeBoolean;
}
- else if ( rType == getCppuCharType() )
+ else if ( rType == cppu::UnoType<cppu::UnoCharType>::get() )
{
// char
sal_Unicode cValue = 0;
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index a8691d063b25..cb77cf3dd60f 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -73,7 +73,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "IsDocument" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -81,7 +81,7 @@ bool ContentProvider::getProperty(
beans::Property(
OUString( "IsFolder" ),
-1,
- getCppuBooleanType(),
+ cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -139,8 +139,7 @@ bool ContentProvider::getProperty(
OUString(
"CreatableContentsInfo" ),
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -205,8 +204,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::LOCKDISCOVERY,
-1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::Lock > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::Lock >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -222,9 +220,7 @@ bool ContentProvider::getProperty(
beans::Property(
DAVProperties::SUPPORTEDLOCK,
-1,
- getCppuType( static_cast<
- const uno::Sequence<
- ucb::LockEntry > * >( 0 ) ),
+ cppu::UnoType<uno::Sequence< ucb::LockEntry >>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ) );
@@ -503,24 +499,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "getCommandInfo" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
aCmdInfo[ 1 ] =
ucb::CommandInfo(
OUString( "getPropertySetInfo" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
aCmdInfo[ 2 ] =
ucb::CommandInfo(
OUString( "getPropertyValues" ),
-1,
- getCppuType( static_cast<
- uno::Sequence< beans::Property > * >( 0 ) ) );
+ cppu::UnoType<uno::Sequence< beans::Property >>::get());
aCmdInfo[ 3 ] =
ucb::CommandInfo(
OUString( "setPropertyValues" ),
-1,
- getCppuType( static_cast<
- uno::Sequence< beans::PropertyValue > * >( 0 ) ) );
+ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get());
// Optional standard commands
@@ -530,7 +524,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "delete" ),
-1,
- getCppuBooleanType() );
+ cppu::UnoType<bool>::get() );
aCmdInfo[ 5 ] =
ucb::CommandInfo(
OUString( "insert" ),
@@ -613,13 +607,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
ucb::CommandInfo(
OUString( "lock" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
nPos++;
aCmdInfo[ nPos ] =
ucb::CommandInfo(
OUString( "unlock" ),
-1,
- getCppuVoidType() );
+ cppu::UnoType<cppu::UnoVoidType>::get() );
nPos++;
}
return aCmdInfo;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 15:47:37 +0000