diff options
Diffstat (limited to 'ucb/source/ucp')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 68 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 18 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 26 | ||||
| -rw-r--r-- | ucb/source/ucp/file/bc.cxx | 10 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filglob.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/file/prov.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontentcaps.cxx | 33 | ||||
| -rw-r--r-- | ucb/source/ucp/gio/gio_content.cxx | 44 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 32 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx | 131 | ||||
| -rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 44 | ||||
| -rw-r--r-- | ucb/source/ucp/package/pkgcontentcaps.cxx | 97 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 42 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_contentcaps.cxx | 116 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 50 |
18 files changed, 359 insertions, 376 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 5296e79fa4b8..6818f6d94aaf 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -261,19 +261,19 @@ namespace size_t i = 0; aArguments[i++] <<= beans::PropertyValue( - OUString( "Binding URL" ), + "Binding URL", - 1, uno::makeAny( rURL.getBindingUrl() ), beans::PropertyState_DIRECT_VALUE ); aArguments[i++] <<= beans::PropertyValue( - OUString( "Username" ), + "Username", -1, uno::makeAny( rURL.getUsername() ), beans::PropertyState_DIRECT_VALUE ); aArguments[i++] <<= beans::PropertyValue( - OUString( "Repository Id" ), + "Repository Id", -1, uno::makeAny( rURL.getRepositoryId() ), beans::PropertyState_DIRECT_VALUE ); @@ -1587,52 +1587,52 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "ObjectId" ), + beans::Property( "ObjectId", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "TitleOnServer" ), + beans::Property( "TitleOnServer", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateCreated" ), + beans::Property( "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateModified" ), + beans::Property( "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Size" ), + beans::Property( "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CreatableContentsInfo" ), + beans::Property( "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "MediaType" ), + beans::Property( "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "CmisProperties" ), + beans::Property( "CmisProperties", -1, cppu::UnoType<uno::Sequence< document::CmisProperty>>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsVersionable" ), + beans::Property( "IsVersionable", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCheckOut" ), + beans::Property( "CanCheckOut", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCancelCheckOut" ), + beans::Property( "CanCancelCheckOut", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CanCheckIn" ), + beans::Property( "CanCheckIn", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -1648,46 +1648,46 @@ namespace cmis { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "delete" ), + ( "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo - ( OUString( "insert" ), + ( "insert", -1, cppu::UnoType<ucb::InsertCommandArgument2>::get() ), ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), // Mandatory CMIS-only commands - ucb::CommandInfo ( OUString( "checkout" ), -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( OUString( "checkIn" ), -1, + ucb::CommandInfo ( "checkout", -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "cancelCheckout", -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "checkIn", -1, cppu::UnoType<ucb::TransferInfo>::get() ), - ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( "updateProperties", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getAllVersions" ), + ( "getAllVersions", -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( OUString( "transfer" ), + ( "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo - ( OUString( "createNewContent" ), + ( "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) }; @@ -1997,7 +1997,7 @@ namespace cmis // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index a008c9b92dff..f130b83b054c 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -259,16 +259,16 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -284,21 +284,21 @@ namespace cmis { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), }; diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 85a008dee62b..950a953fed99 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -417,22 +417,22 @@ namespace ucb { namespace ucp { namespace ext else { // Append all Core Properties. - xRow->appendString ( Property( OUString("ContentType"), + xRow->appendString ( Property( "ContentType", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( OUString("Title"), + xRow->appendString ( Property( "Title", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( OUString("IsDocument"), + xRow->appendBoolean( Property( "IsDocument", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), false ); - xRow->appendBoolean( Property( OUString("IsFolder"), + xRow->appendBoolean( Property( "IsFolder", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -536,22 +536,22 @@ namespace ucb { namespace ucp { namespace ext // Mandatory commands CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<Sequence< Property >>::get() ), CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<Sequence< PropertyValue >>::get() ) @@ -559,7 +559,7 @@ namespace ucb { namespace ucp { namespace ext // Optional standard commands , CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<OpenCommandArgument2>::get() ) @@ -574,25 +574,25 @@ namespace ucb { namespace ucp { namespace ext static const Property aProperties[] = { Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - OUString( "Title" ), + "Title", -1, 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 6f45334bc53f..cfd21fda6fe4 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -377,7 +377,7 @@ BaseContent::execute( const Command& aCommand, { Sequence< beans::Property > seq(1); seq[0] = beans::Property( - OUString("CasePreservingURL"), + "CasePreservingURL", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -480,7 +480,7 @@ BaseContent::getContentType() { // Who am I ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -598,7 +598,7 @@ BaseContent::createNewContent( const ContentInfo& Info ) try { Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -1031,7 +1031,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // Is destination a document or a folder ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); @@ -1097,7 +1097,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, bool bDocument = false; Sequence< beans::Property > seq(1); - seq[0] = beans::Property( OUString("IsDocument"), + seq[0] = beans::Property( "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 ); diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 9700d66ddbca..32010ebf050e 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -120,25 +120,25 @@ namespace { (bRemoveProperty ? 1 : 0) ); sal_Int32 i = 0; aArguments[i++] - <<= PropertyValue(OUString( "Uri"), + <<= PropertyValue("Uri", -1, makeAny(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) aArguments[i++] - <<= PropertyValue(OUString( "ResourceName"), + <<= PropertyValue("ResourceName", -1, makeAny(aResourceName), PropertyState_DIRECT_VALUE); if (bResourceType) aArguments[i++] - <<= PropertyValue(OUString( "ResourceType"), + <<= PropertyValue("ResourceType", -1, makeAny(aResourceType), PropertyState_DIRECT_VALUE); if (bRemoveProperty) aArguments[i++] - <<= PropertyValue(OUString( "Removable"), + <<= PropertyValue("Removable", -1, makeAny(bRemovable), PropertyState_DIRECT_VALUE); diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 653289b13a5c..9c534b50c6fb 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -965,7 +965,7 @@ TaskManager::setv( const OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); ret[0] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError(IOErrorCode_GENERAL); @@ -1029,7 +1029,7 @@ TaskManager::setv( const OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); names[0] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError; @@ -3048,7 +3048,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo() uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 5552d016a43b..eeb5c75a1a4b 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -281,17 +281,17 @@ private: XPropertySetInfoImpl2::XPropertySetInfoImpl2() : m_seq( 3 ) { - m_seq[0] = Property( OUString("HostName"), + m_seq[0] = Property( "HostName", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ); - m_seq[1] = Property( OUString("HomeDirectory"), + m_seq[1] = Property( "HomeDirectory", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ); - m_seq[2] = Property( OUString("FileSystemNotation"), + m_seq[2] = Property( "FileSystemNotation", -1, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY ); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 4cde1893879d..6fcea525b790 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -599,7 +599,7 @@ FTPContent::queryCreatableContentsInfo_Static( ) | ContentInfoAttribute::KIND_DOCUMENT; Sequence< Property > props( 1 ); props[0] = Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 2f35f170a302..64dd0e92d5a4 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,57 +41,56 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND // | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "DateCreated" ), + "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsReadOnly" ), + "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -121,42 +120,42 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ), ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 15712d99b170..a6467d548b76 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1107,7 +1107,7 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); @@ -1213,40 +1213,40 @@ uno::Sequence< beans::Property > Content::getProperties( { static const beans::Property aGenericProperties[] = { - beans::Property( OUString( "IsDocument" ), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsFolder" ), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Title" ), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( OUString( "IsReadOnly" ), + beans::Property( "IsReadOnly", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateCreated" ), + beans::Property( "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "DateModified" ), + beans::Property( "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "Size" ), + beans::Property( "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsVolume" ), + beans::Property( "IsVolume", 1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsCompactDisc" ), + beans::Property( "IsCompactDisc", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsRemoveable" ), + beans::Property( "IsRemoveable", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "IsHidden" ), + beans::Property( "IsHidden", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( OUString( "CreatableContentsInfo" ), + beans::Property( "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) }; @@ -1261,35 +1261,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc { // Required commands ucb::CommandInfo - ( OUString( "getCommandInfo" ), + ( "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertySetInfo" ), + ( "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( OUString( "getPropertyValues" ), + ( "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( OUString( "setPropertyValues" ), + ( "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( OUString( "delete" ), + ( "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo - ( OUString( "insert" ), + ( "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ), ucb::CommandInfo - ( OUString( "open" ), + ( "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( OUString( "transfer" ), + ( "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo - ( OUString( "createNewContent" ), + ( "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) }; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 114a37df3fe8..db8da992afde 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -462,7 +462,7 @@ uno::Any SAL_CALL HierarchyContent::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -974,28 +974,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( OUString("ContentType"), + beans::Property( "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); xRow->appendString ( - beans::Property( OUString("Title"), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( OUString("IsDocument"), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( OUString("IsFolder"), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( rData.getIsDocument() ) xRow->appendString( - beans::Property( OUString("TargetURL"), + beans::Property( "TargetURL", -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! @@ -1012,7 +1012,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( rData.getTargetURL() ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1322,7 +1322,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1468,7 +1468,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1591,7 +1591,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1630,7 +1630,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1663,7 +1663,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -1793,7 +1793,7 @@ void HierarchyContent::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( xSource->m_xIdentifier-> @@ -1830,7 +1830,7 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aFolderProps( 1 ); aFolderProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -1842,12 +1842,12 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aLinkProps( 2 ); aLinkProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); aLinkProps.getArray()[ 1 ] = beans::Property( - OUString("TargetURL"), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index c8094aef3d35..af317bd18af0 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -97,28 +97,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -128,15 +128,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( "TargetURL" ), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -155,28 +154,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -185,14 +184,13 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( "TargetURL" ), + "TargetURL", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -219,28 +217,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -250,8 +248,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -270,28 +267,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -300,8 +297,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -329,28 +325,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -360,8 +356,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -396,22 +391,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ) @@ -432,22 +427,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -455,12 +450,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ) @@ -486,22 +481,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -509,7 +504,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -527,22 +522,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -550,27 +545,27 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -596,22 +591,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -619,7 +614,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -637,22 +632,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -660,17 +655,17 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 7d7285b61d94..2fe01f03aff3 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -102,7 +102,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -555,7 +555,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -627,7 +627,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -887,7 +887,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - OUString("ContentType"), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -895,14 +895,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.aContentType ); xRow->appendString( beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - OUString("IsDocument"), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -910,7 +910,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - OUString("IsFolder"), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -918,7 +918,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -927,7 +927,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - OUString("MediaType"), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), @@ -938,7 +938,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - OUString("Size"), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -947,7 +947,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - OUString("Compressed"), + "Compressed", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -955,7 +955,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - OUString("Encrypted"), + "Encrypted", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -968,7 +968,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - OUString("HasEncryptedEntries"), + "HasEncryptedEntries", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1367,8 +1367,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( - "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1439,8 +1438,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( - "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1498,7 +1496,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1666,7 +1664,7 @@ void Content::insert( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1782,7 +1780,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1821,7 +1819,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1853,7 +1851,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Folder"), + "Folder", -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -2010,7 +2008,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( xSource->m_xIdentifier-> diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 9e6988e60018..c01201d10a1e 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -98,28 +98,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -129,14 +129,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -146,7 +145,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "HasEncryptedEntries" ), + "HasEncryptedEntries", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -168,28 +167,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -198,14 +197,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -231,28 +229,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -261,21 +259,20 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -285,13 +282,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "Compressed" ), + "Compressed", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - OUString( "Encrypted" ), + "Encrypted", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -323,22 +320,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -346,17 +343,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -364,7 +361,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - OUString( "flush" ), + "flush", -1, cppu::UnoType<void>::get() ) @@ -385,22 +382,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -408,27 +405,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -436,7 +433,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - OUString( "flush" ), + "flush", -1, cppu::UnoType<void>::get() ) @@ -458,22 +455,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -481,17 +478,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index aae1913dc379..39fec06b4f24 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -525,7 +525,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1003,7 +1003,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( OUString("ContentType"), + beans::Property( "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -1013,7 +1013,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ContentType eType = rData.getType(); xRow->appendString ( - beans::Property( OUString("Title"), + beans::Property( "Title", -1, cppu::UnoType<OUString>::get(), // Title is read-only for root and documents. @@ -1023,14 +1023,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( : 0 ) ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( OUString("IsDocument"), + beans::Property( "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( OUString("IsFolder"), + beans::Property( "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -1038,7 +1038,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getIsFolder() ); xRow->appendObject( beans::Property( - OUString("CreatableContentsInfo"), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1048,7 +1048,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Storage is only supported by folders. if ( eType == FOLDER ) xRow->appendObject( - beans::Property( OUString("Storage"), + beans::Property( "Storage", -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -1058,7 +1058,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // DocumentModel is only supported by documents. if ( eType == DOCUMENT ) xRow->appendObject( - beans::Property( OUString("DocumentModel"), + beans::Property( "DocumentModel", -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -1339,7 +1339,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1413,7 +1413,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1447,7 +1447,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1507,7 +1507,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1690,7 +1690,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1947,7 +1947,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2026,7 +2026,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2057,7 +2057,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2095,7 +2095,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( aTargetUri ), beans::PropertyState_DIRECT_VALUE)); @@ -2137,7 +2137,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2159,7 +2159,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2178,7 +2178,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - OUString( "Uri"), + "Uri", -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2875,7 +2875,7 @@ ContentProperties::getCreatableContentsInfo() const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - OUString("Title"), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 9857ec8aefb3..4ebaf91bb0d1 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -103,28 +103,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -133,8 +133,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -159,28 +158,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -189,8 +188,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -200,7 +198,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "Storage" ), + "Storage", -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -222,28 +220,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -253,8 +251,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -264,7 +261,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - OUString( "DocumentModel" ), + "DocumentModel", -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -288,28 +285,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -319,8 +316,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -359,22 +355,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -382,12 +378,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -408,22 +404,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType< uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -431,17 +427,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -464,22 +460,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -487,27 +483,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -530,22 +526,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -553,17 +549,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - OUString( "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -588,22 +584,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -611,7 +607,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 1279eaa2a85e..c825798aaa76 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -3574,7 +3574,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - OUString("Uri"), -1, + "Uri", -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index c86938e533af..7f2a381c160b 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -78,7 +78,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - OUString( "ContentType" ), + "ContentType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -86,7 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsDocument" ), + "IsDocument", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -94,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "IsFolder" ), + "IsFolder", -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -102,7 +102,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Title" ), + "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ) ); @@ -111,7 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateCreated" ), + "DateCreated", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -119,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "DateModified" ), + "DateModified", -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -127,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "MediaType" ), + "MediaType", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -135,7 +135,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "Size" ), + "Size", -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -143,7 +143,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( "BaseURI" ), + "BaseURI", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -151,8 +151,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - OUString( - "CreatableContentsInfo" ), + "CreatableContentsInfo", -1, cppu::UnoType< uno::Sequence< ucb::ContentInfo >>::get(), @@ -544,22 +543,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - OUString( "getCommandInfo" ), + "getCommandInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - OUString( "getPropertySetInfo" ), + "getPropertySetInfo", -1, cppu::UnoType<void>::get() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - OUString( "getPropertyValues" ), + "getPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ); aCmdInfo[ 3 ] = ucb::CommandInfo( - OUString( "setPropertyValues" ), + "setPropertyValues", -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ); @@ -569,17 +568,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - OUString( "delete" ), + "delete", -1, cppu::UnoType<bool>::get() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - OUString( "insert" ), + "insert", -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ); aCmdInfo[ 6 ] = ucb::CommandInfo( - OUString( "open" ), + "open", -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ); @@ -589,17 +588,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - OUString( "post" ), + "post", -1, cppu::UnoType<ucb::PostCommandArgument2>::get() ); aCmdInfo[ 8 ] = ucb::CommandInfo( - OUString( "addProperty" ), + "addProperty", -1, cppu::UnoType<ucb::PropertyCommandArgument>::get() ); aCmdInfo[ 9 ] = ucb::CommandInfo( - OUString( "removeProperty" ), + "removeProperty", -1, cppu::UnoType<rtl::OUString>::get() ); @@ -632,14 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "transfer" ), + "transfer", -1, cppu::UnoType<ucb::TransferInfo>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( - "createNewContent" ), + "createNewContent", -1, cppu::UnoType<ucb::ContentInfo>::get() ); nPos++; @@ -653,13 +651,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "lock" ), + "lock", -1, cppu::UnoType<void>::get() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - OUString( "unlock" ), + "unlock", -1, cppu::UnoType<void>::get() ); nPos++; |