diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /ucb | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'ucb')
21 files changed, 407 insertions, 516 deletions
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 1191d6ab8f59..b3922f9ac462 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -174,7 +174,7 @@ namespace ucb { namespace ucp { namespace ext // obtain the properties which our result set is set up for from the wrapped content Sequence< ::rtl::OUString > aPropertyNames(1); - aPropertyNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); + aPropertyNames[0] = ::rtl::OUString( "Title" ); const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 6a498446c620..9005de240c48 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,57 +41,57 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND // | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), + rtl::OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -124,49 +124,46 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index f4d60c85b5fc..638c2ff5820b 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -61,7 +61,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw io::NotConnectedException(); if (!g_seekable_can_seek(G_SEEKABLE(mpStream))) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Seek unsupported")), + throw io::IOException(rtl::OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index 2f9774ef5de4..b3777144b463 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -46,7 +46,7 @@ void SAL_CALL Seekable::truncate( void ) throw io::NotConnectedException(); if (!g_seekable_can_truncate(mpStream)) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Truncate unsupported")), + throw io::IOException(rtl::OUString("Truncate unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -61,7 +61,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) throw io::NotConnectedException(); if (!g_seekable_can_seek(mpStream)) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Seek unsupported")), + throw io::IOException(rtl::OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -111,7 +111,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc } if (!bOk) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting size unsupported")), + throw io::IOException(rtl::OUString("Getting size unsupported"), static_cast< cppu::OWeakObject * >(this)); return nSize; diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 4d5a91384e84..96aa7dad4faf 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -102,30 +102,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -135,15 +133,15 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ) ), + rtl::OUString( "TargetURL" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -163,30 +161,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -195,14 +191,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ) ), + rtl::OUString( "TargetURL" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -231,30 +227,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -264,8 +258,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -285,30 +279,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -317,8 +309,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -348,28 +340,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -379,8 +371,8 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -417,27 +409,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -461,27 +449,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -491,12 +475,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ) @@ -523,27 +507,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -553,7 +533,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -572,27 +552,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -602,29 +578,28 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -651,27 +626,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -681,7 +652,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -700,27 +671,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -730,19 +697,18 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 40f345a841e9..5453c195b328 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -728,13 +728,13 @@ Content::createNewContent( const ucb::ContentInfo& Info ) return uno::Reference< ucb::XContent >(); rtl::OUString aURL = m_aUri.getUri(); - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aURL += rtl::OUString("/"); if ( Info.Type.equalsIgnoreAsciiCase( getContentType( m_aUri.getScheme(), sal_True ) ) ) - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder")); + aURL += rtl::OUString("New_Folder"); else - aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Stream")); + aURL += rtl::OUString("New_Stream"); uno::Reference< ucb::XContentIdentifier > xId( new ::ucbhelper::ContentIdentifier( aURL ) ); @@ -922,7 +922,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")), + rtl::OUString("ContentType"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -930,14 +930,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.aContentType ); xRow->appendString( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), + rtl::OUString("Title"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")), + rtl::OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")), + rtl::OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -953,7 +953,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")), + rtl::OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -963,7 +963,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), + rtl::OUString("MediaType"), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), @@ -974,7 +974,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")), + rtl::OUString("Size"), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -983,7 +983,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")), + rtl::OUString("Compressed"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -991,7 +991,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")), + rtl::OUString("Encrypted"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasEncryptedEntries")), + rtl::OUString("HasEncryptedEntries"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1075,32 +1075,32 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1109,8 +1109,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1139,8 +1139,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Empty title not allowed!" )), + rtl::OUString( + "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1149,8 +1149,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1175,8 +1175,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1184,8 +1184,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Compressed" ) @@ -1211,16 +1211,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Compressed only supported by streams!" )), + rtl::OUString( + "Compressed only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1247,16 +1247,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Encrypted only supported by streams!" )), + rtl::OUString( + "Encrypted only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1264,8 +1264,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property is read-only!" )), + rtl::OUString( + "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "EncryptionKey" ) @@ -1296,16 +1296,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Property value has wrong type!" )), + rtl::OUString( + "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "EncryptionKey not supported by non-root folder!" )), + rtl::OUString( + "EncryptionKey not supported by non-root folder!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1358,8 +1358,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "No property set for storing the value!" )), + rtl::OUString( + "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1371,7 +1371,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Assemble new content identifier... rtl::OUString aNewURL = m_aUri.getParentUri(); - aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aNewURL += rtl::OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); @@ -1394,14 +1394,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")), + rtl::OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aNewTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aEvent.PropertyName = rtl::OUString("Title"); aEvent.OldValue = uno::makeAny( m_aProps.aTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1422,8 +1422,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Uri")), + rtl::OUString( + "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1432,8 +1432,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Cannot store persistent data!" )), + rtl::OUString( + "Cannot store persistent data!" ), this ); // Unreachable } @@ -1496,8 +1496,8 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Uri")), + rtl::OUString( + "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1508,7 +1508,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Got no data stream!")), + rtl::OUString("Got no data stream!"), this ); // Unreachable } diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 528b18d948df..a1261eb565ba 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -103,30 +103,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -136,14 +134,14 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -154,8 +152,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "HasEncryptedEntries" ) ), + rtl::OUString( "HasEncryptedEntries" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -178,30 +175,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -210,14 +205,14 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -245,28 +240,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -275,21 +270,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -300,13 +295,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), + rtl::OUString( "Compressed" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) ), + rtl::OUString( "Encrypted" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -339,28 +334,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -370,20 +361,19 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -391,7 +381,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flush" ) ), + rtl::OUString( "flush" ), -1, getCppuVoidType() ) @@ -413,28 +403,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -444,30 +430,29 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -475,7 +460,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flush" ) ), + rtl::OUString( "flush" ), -1, getCppuVoidType() ) @@ -498,27 +483,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -528,17 +509,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index b3c201786b24..cfa46a17a9db 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -77,7 +77,7 @@ void PackageUri::init() const if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -92,7 +92,7 @@ void PackageUri::init() const != sal_Unicode( '/' ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -116,8 +116,8 @@ void PackageUri::init() const { m_aParam += ( !m_aParam.isEmpty() - ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "&purezip" ) ) - : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?purezip" ) ) ); + ? ::rtl::OUString( "&purezip" ) + : ::rtl::OUString( "?purezip" ) ); } aPureUri = aPureUri.replaceAt( 0, @@ -131,7 +131,7 @@ void PackageUri::init() const // Only <scheme>:/// - Empty authority // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } else if ( nEnd == ( aPureUri.getLength() - 1 ) ) @@ -142,7 +142,7 @@ void PackageUri::init() const // Only <scheme>://// or <scheme>://<something>// // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -163,7 +163,7 @@ void PackageUri::init() const nStart, aPureUri.getLength() - nStart, aNormPackage ); m_aPackage = ::ucb_impl::urihelper::decodeSegment( aNormPackage ); - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); m_aUri = m_aUri.replaceAt( 0, ( nParam >= 0 ) ? nParam @@ -189,11 +189,11 @@ void PackageUri::init() const if ( m_aPath.indexOf( "//" ) != -1 || m_aPath.indexOf( "%2F" ) != -1 || m_aPath.indexOf( "%2f" ) != -1 - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) ) - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( ".." ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( "." ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); return; } @@ -230,7 +230,7 @@ void PackageUri::init() const else { // error, but remember that we did a init(). - m_aPath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + m_aPath = rtl::OUString( "/" ); } } } diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 61eb808e15d0..0ebf3729b26a 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -110,30 +110,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -142,8 +140,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -170,30 +168,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -202,8 +198,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -214,7 +210,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Storage" ) ), + rtl::OUString( "Storage" ), -1, getCppuType( static_cast< const uno::Reference< embed::XStorage > * >( 0 ) ), @@ -238,30 +234,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -271,8 +265,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -283,7 +277,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentModel" ) ), + rtl::OUString( "DocumentModel" ), -1, getCppuType( static_cast< const uno::Reference< frame::XModel > * >( 0 ) ), @@ -309,28 +303,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -340,8 +334,8 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -383,27 +377,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -413,12 +403,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -442,27 +432,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -472,17 +458,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -507,27 +493,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -537,29 +519,28 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -583,27 +564,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -613,19 +590,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -651,27 +627,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -681,7 +653,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 19f35caaa349..b0e03e8ac664 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -76,8 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; - aDocEvent.EventName = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) ); + aDocEvent.EventName = rtl::OUString( "OfficeDocumentsListener::notifyClosing" ); m_pManager->notifyEvent( aDocEvent ); } @@ -147,8 +146,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) try { uno::Any aValue = xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "RuntimeUID" ) ) ); + rtl::OUString( "RuntimeUID" ) ); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 8c7b5859c9fb..dca9415f4bd8 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -93,8 +93,8 @@ DocumentContentFactory::getSupportedServiceNames() // static rtl::OUString DocumentContentFactory::getImplementationName_Static() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ) ); + return rtl::OUString( + "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ); } //========================================================================= @@ -104,8 +104,8 @@ DocumentContentFactory::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ) ); + = rtl::OUString( + "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ); return aSNS; } @@ -127,8 +127,8 @@ DocumentContentFactory::createDocumentContent( xDocFac = uno::Reference< frame::XTransientDocumentsDocumentContentFactory >( m_xSMgr->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.TransientDocumentsContentProvider" ) ) + rtl::OUString( + "com.sun.star.ucb.TransientDocumentsContentProvider" ) ), uno::UNO_QUERY ); } @@ -141,8 +141,8 @@ DocumentContentFactory::createDocumentContent( return xDocFac->createDocumentContent( Model ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unable to obtain document content factory!" ) ), + rtl::OUString( + "Unable to obtain document content factory!" ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 7a9c223a04c5..6993d2e143ab 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -97,8 +97,8 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ), + rtl::OUString( + "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) ); @@ -125,7 +125,7 @@ ContentProvider::queryContent( Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) throw ucb::IllegalIdentifierException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid URL!" ) ), + rtl::OUString( "Invalid URL!" ), Identifier ); // Normalize URI. @@ -190,16 +190,16 @@ ContentProvider::createDocumentContent( // no content. throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Illegal Content Identifier!" ) ), + rtl::OUString( + "Illegal Content Identifier!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } else { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unable to obtain document id from model!" ) ), + rtl::OUString( + "Unable to obtain document id from model!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } @@ -207,8 +207,8 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No Document Manager!" ) ), + rtl::OUString( + "No Document Manager!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index e31a877796f2..5b84469822c6 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -98,8 +98,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, ( eMode != READ_WRITE_NOCREATE ) && ( eMode != READ_WRITE_CREATE ) ) throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Invalid open mode!" ) ), + rtl::OUString( + "Invalid open mode!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -107,8 +107,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Root never has a storage!" ) ), + rtl::OUString( + "Root never has a storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 1 ) ); } @@ -420,8 +420,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( sal_Int16( 2 ) ); else throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Invalid document id!" ) ), + rtl::OUString( + "Invalid document id!" ), uno::Reference< uno::XInterface >() ); } @@ -435,8 +435,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( try { uno::Any aPropValue = xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ) ) ); + rtl::OUString( "OpenMode" ) ); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) @@ -448,8 +447,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not readable. throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Storage is open, but not readable!" ) ), + rtl::OUString( + "Storage is open, but not readable!" ), uno::Reference< uno::XInterface >() ); } // storage okay @@ -461,8 +460,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not writable. throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Storage is open, but not writable!" ) ), + rtl::OUString( + "Storage is open, but not writable!" ), uno::Reference< uno::XInterface >() ); } // storage okay @@ -475,8 +474,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "Bug! Value of property OpenMode has wrong type!" ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Bug! Value of property OpenMode has wrong type!" ) ), + rtl::OUString( + "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >() ); } } @@ -485,8 +484,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Property OpenMode not supported!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Bug! Value of property OpenMode has wrong type!" ) ), + rtl::OUString( + "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -495,8 +494,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Caught WrappedTargetException!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "WrappedTargetException during getPropertyValue!" ) ), + rtl::OUString( + "WrappedTargetException during getPropertyValue!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -559,8 +558,8 @@ StorageElementFactory::queryStream( if ( !xParentStorage.is() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No parent storage!" ) ), + rtl::OUString( + "No parent storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -569,16 +568,16 @@ StorageElementFactory::queryStream( if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Root never is a stream!" ) ), + rtl::OUString( + "Root never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } else if ( aUri.isDocument() ) { throw lang::IllegalArgumentException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "A document never is a stream!" ) ), + rtl::OUString( + "A document never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -615,8 +614,8 @@ StorageElementFactory::queryStream( OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" ); throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "Unknown open mode!" ) ), + rtl::OUString( + "Unknown open mode!" ), uno::Reference< uno::XInterface >() ); } @@ -672,8 +671,8 @@ StorageElementFactory::queryStream( if ( !xStream.is() ) { throw embed::InvalidStorageException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No stream!" ) ), + rtl::OUString( + "No stream!" ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 530306c2badc..5886429d2089 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -268,7 +268,7 @@ void NeonUri::calculateURI () return aTemp; } else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")); + return rtl::OUString("/"); } bool NeonUri::operator== ( const NeonUri & rOther ) const @@ -284,7 +284,7 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const void NeonUri::AppendPath (const rtl::OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")); + mPath += rtl::OUString("/"); mPath += rPath; calculateURI (); diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 478dc66a4bb4..0c3cd9ac6456 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -78,8 +78,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -87,8 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -96,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -104,7 +102,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); @@ -113,8 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -122,8 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + rtl::OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -131,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -139,7 +135,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -147,7 +143,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -155,8 +151,8 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -431,21 +427,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ) ); + rtl::OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ) ); + rtl::OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ); + rtl::OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ); + rtl::OUString( "Title" ) ); } // Add optional properties. @@ -454,29 +450,29 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ) ); + rtl::OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ) ); + rtl::OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ); + rtl::OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ) ); + rtl::OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ); + rtl::OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ) ); + rtl::OUString( + "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) @@ -532,27 +528,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -563,18 +555,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -585,7 +577,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "post" ) ), + rtl::OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -618,14 +610,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "createNewContent" ) ), + rtl::OUString( + "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); nPos++; @@ -639,13 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lock" ) ), + rtl::OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unlock" ) ), + rtl::OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 9e5a4f7cd0a8..3df9f0cc7766 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -97,8 +97,7 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "*** unknown ***" ) ) ), + rtl::OUString( "*** unknown ***" ) ), true ); } @@ -578,17 +577,17 @@ namespace DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ETag" ) ), + rtl::OUString( "ETag" ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Last-Modified" ) ), + rtl::OUString( "DateModified" ), + rtl::OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content-Length" ) ), + rtl::OUString( "Size" ), + rtl::OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) + rtl::OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 8f351de50912..2c1b7819753b 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -138,7 +138,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DAV:" ) ); + aNameSpace = rtl::OUString( "DAV:" ); } } diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 0a98c4edf2c1..32201ef410a0 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -207,7 +207,7 @@ bool SerfSession::isHeadRequestInProgress() bool SerfSession::isSSLNeeded() { - return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "https" ) ) ); + return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( "https" ) ); } char* SerfSession::getHostinfo() diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 3594ddd96083..0c75ca3fd1e3 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,8 +188,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) m_xSMgr, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xCtx; xCtx.set( xProps->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), + rtl::OUString( "DefaultContext" ) ), uno::UNO_QUERY_THROW ); uno::Reference< task::XInteractionHandler > xIH( @@ -961,7 +960,7 @@ Content::queryCreatableContentsInfo() beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), aProp ); + rtl::OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -1383,7 +1382,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1393,16 +1392,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1425,7 +1424,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1435,11 +1434,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ) + rtl::OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "CreatableContentsInfo" ) ), + rtl::OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -3129,8 +3127,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { rtl::OUString aLocation; m_xCachedProps->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Content-Location" ) ) ) >>= aLocation; + "Content-Location" ) ) >>= aLocation; if ( aLocation.getLength() ) { try diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 011094154092..982a2a19b9e0 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -62,8 +62,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + rtl::OUString( "ContentType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -71,8 +70,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -80,7 +78,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -88,7 +86,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); @@ -97,8 +95,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -106,8 +103,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + rtl::OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -115,7 +111,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -123,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -131,7 +127,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + rtl::OUString( "BaseURI" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -139,8 +135,8 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ), + rtl::OUString( + "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -426,21 +422,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ) ); + rtl::OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ) ); + rtl::OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ); + rtl::OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ); + rtl::OUString( "Title" ) ); } // Add optional properties. @@ -449,29 +445,29 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ) ); + rtl::OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ) ); + rtl::OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ); + rtl::OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ) ); + rtl::OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ); + rtl::OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "CreatableContentsInfo" ) ) ); + rtl::OUString( + "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) @@ -525,27 +521,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + rtl::OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + rtl::OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + rtl::OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -556,18 +548,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + rtl::OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + rtl::OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + rtl::OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -578,7 +570,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "post" ) ), + rtl::OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -611,14 +603,14 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + rtl::OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "createNewContent" ) ), + rtl::OUString( + "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); nPos++; @@ -632,13 +624,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lock" ) ), + rtl::OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unlock" ) ), + rtl::OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 2d01a1eac1f8..1d1523ff84de 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -444,8 +444,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "IsFolder" ) ) ); + "IsFolder" ) ); rValue >>= bFolder; if ( !bFolder ) @@ -461,8 +460,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "IsDocument" ) ) ); + "IsDocument" ) ); rValue >>= bDocument; if ( !bDocument ) |