From ca6d048e81cd079e66f73db93c4758b4df53cc21 Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Tue, 12 Mar 2013 21:01:14 +0100 Subject: Remove RTL_CONSTASCII_USTRINGPARAM in ucb/ucbhelper Change-Id: I7419a328012962b6b72d2596df034ff912fc12cd --- ucb/source/core/cmdenv.cxx | 7 +- ucb/source/regexp/regexp.cxx | 25 +++--- ucb/source/ucp/cmis/cmis_content.cxx | 91 +++++++++++----------- ucb/source/ucp/cmis/cmis_datasupplier.cxx | 2 +- ucb/source/ucp/cmis/cmis_provider.cxx | 6 +- ucb/source/ucp/cmis/cmis_repo_content.cxx | 26 +++---- .../source/client/fileidentifierconverter.cxx | 2 +- ucbhelper/source/provider/registerucb.cxx | 6 +- 8 files changed, 77 insertions(+), 88 deletions(-) diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 34ea28a51e96..43799dbd1303 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -111,8 +111,7 @@ UcbCommandEnvironment::getSupportedServiceNames() // static rtl::OUString UcbCommandEnvironment::getImplementationName_Static() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.CommandEnvironment" ) ); + return rtl::OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); } //========================================================================= @@ -121,9 +120,7 @@ uno::Sequence< rtl::OUString > UcbCommandEnvironment::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.CommandEnvironment" ) ); + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CommandEnvironment"; return aSNS; } diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index db3934bcb79a..58ba06529b91 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -235,24 +235,22 @@ rtl::OUString Regexp::getRegexp(bool bReverse) const switch (m_eKind) { case KIND_PREFIX: - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("(.*)")); + aBuffer.append("(.*)"); break; case KIND_AUTHORITY: - aBuffer. - appendAscii(RTL_CONSTASCII_STRINGPARAM("(([/?#].*)?)")); + aBuffer.append("(([/?#].*)?)"); break; case KIND_DOMAIN: - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("([^/?#]")); + aBuffer.append("([^/?#]"); aBuffer.append(sal_Unicode(m_bEmptyDomain ? '*' : '+')); if (!m_aInfix.isEmpty()) appendStringLiteral(&aBuffer, m_aInfix); - aBuffer. - appendAscii(RTL_CONSTASCII_STRINGPARAM("([/?#].*)?)")); + aBuffer.append("([/?#].*)?)"); break; } - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("->")); + aBuffer.append("->"); if (bReverse) { if (!m_aPrefix.isEmpty()) @@ -263,7 +261,7 @@ rtl::OUString Regexp::getRegexp(bool bReverse) const if (!m_aReversePrefix.isEmpty()) appendStringLiteral(&aBuffer, m_aReversePrefix); } - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("\\1")); + aBuffer.append("\\1"); return aBuffer.makeStringAndClear(); } else if (m_eKind == KIND_PREFIX && isScheme(m_aPrefix, true)) @@ -276,19 +274,19 @@ rtl::OUString Regexp::getRegexp(bool bReverse) const switch (m_eKind) { case KIND_PREFIX: - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(".*")); + aBuffer.append(".*"); break; case KIND_AUTHORITY: - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("([/?#].*)?")); + aBuffer.append("([/?#].*)?"); break; case KIND_DOMAIN: - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("[^/?#]")); + aBuffer.append("[^/?#]"); aBuffer.append(sal_Unicode(m_bEmptyDomain ? '*' : '+')); if (!m_aInfix.isEmpty()) appendStringLiteral(&aBuffer, m_aInfix); - aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("([/?#].*)?")); + aBuffer.append("([/?#].*)?"); break; } return aBuffer.makeStringAndClear(); @@ -361,8 +359,7 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) // where is as defined in RFC 2396: if (isScheme(rRegexp, false)) return Regexp(Regexp::KIND_PREFIX, - rRegexp - + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")), + rRegexp + ":", false, rtl::OUString(), false, diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 2a78b4e03898..7b9dbfcdf2fd 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -425,7 +425,7 @@ namespace cmis uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong argument type!")), + rtl::OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -961,8 +961,7 @@ namespace cmis ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Unsupported URL scheme!" )), + rtl::OUString("Unsupported URL scheme!"), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1161,14 +1160,14 @@ namespace cmis for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) || - rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + if ( rValue.Name == "ContentType" || + rValue.Name == "MediaType" || + rValue.Name == "IsDocument" || + rValue.Name == "IsFolder" || + rValue.Name == "Size" || + rValue.Name == "CreatableContentsInfo" ) { - lang::IllegalAccessException e ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")), + lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"), static_cast< cppu::OWeakObject* >( this ) ); aRet[ n ] <<= e; } @@ -1178,7 +1177,7 @@ namespace cmis if (!( rValue.Value >>= aNewTitle )) { 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 ) ); continue; } @@ -1186,7 +1185,7 @@ namespace cmis if ( aNewTitle.getLength() <= 0 ) { 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 ); continue; @@ -1198,7 +1197,7 @@ namespace cmis else { SAL_INFO( "cmisucp", "Couln't set property: " << rValue.Name ); - lang::IllegalAccessException e ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")), + lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"), static_cast< cppu::OWeakObject* >( this ) ); aRet[ n ] <<= e; } @@ -1272,52 +1271,52 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + beans::Property( rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + beans::Property( rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + beans::Property( rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TitleOnServer" ) ), + beans::Property( rtl::OUString( "TitleOnServer" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), + beans::Property( rtl::OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + beans::Property( rtl::OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + beans::Property( rtl::OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + beans::Property( 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" ) ), + beans::Property( rtl::OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + beans::Property( rtl::OUString( "MediaType" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CmisPropertiesValues" ) ), + beans::Property( rtl::OUString( "CmisPropertiesValues" ), -1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CmisPropertiesDisplayNames" ) ), + beans::Property( rtl::OUString( "CmisPropertiesDisplayNames" ), -1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVersionable" ) ), + beans::Property( rtl::OUString( "IsVersionable" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CanCheckOut" ) ), + beans::Property( rtl::OUString( "CanCheckOut" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CanCancelCheckOut" ) ), + beans::Property( rtl::OUString( "CanCancelCheckOut" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CanCheckIn" ) ), + beans::Property( rtl::OUString( "CanCheckIn" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -1333,27 +1332,27 @@ namespace cmis { // 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 * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + ( rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // 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, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + ( rtl::OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), // Mandatory CMIS-only commands @@ -1364,10 +1363,10 @@ namespace cmis // Folder Only, omitted if not a folder ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + ( rtl::OUString( "transfer" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ), + ( rtl::OUString( "createNewContent" ), -1, getCppuType( static_cast( 0 ) ) ) }; @@ -1446,22 +1445,22 @@ namespace cmis rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.CmisContent")); + return rtl::OUString("com.sun.star.comp.CmisContent"); } uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.CmisContent")); + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CmisContent"; return aSNS; } rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { return isFolder( uno::Reference< ucb::XCommandEnvironment >() ) - ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CMIS_FOLDER_TYPE )) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CMIS_FILE_TYPE )); + ? rtl::OUString(CMIS_FOLDER_TYPE) + : rtl::OUString(CMIS_FILE_TYPE); } uno::Any SAL_CALL Content::execute( @@ -1505,7 +1504,7 @@ namespace cmis ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv ); aRet <<= setPropertyValues( aProperties, xEnv ); } - else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) + else if (aCommand.Name == "createNewContent" && isFolder( xEnv ) ) { ucb::ContentInfo arg; @@ -1673,19 +1672,19 @@ namespace cmis // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), + rtl::OUString("Title"), -1, getCppuType( static_cast< rtl::OUString* >( 0 ) ), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); // file - seq[0].Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CMIS_FILE_TYPE )); + seq[0].Type = rtl::OUString(CMIS_FILE_TYPE); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CMIS_FOLDER_TYPE )); + seq[1].Type = rtl::OUString(CMIS_FOLDER_TYPE); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 79de0590c6ac..9d8b504fabaa 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -136,7 +136,7 @@ namespace cmis xContent, uno::UNO_QUERY_THROW ); sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() ); ucb::Command aCmd; - aCmd.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); + aCmd.Name = rtl::OUString("getPropertyValues"); aCmd.Handle = -1; aCmd.Argument <<= getResultSet()->getProperties(); uno::Any aResult( xCmdProc->execute( diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 17c57a45b042..012e6c756806 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -117,10 +117,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.CmisContentProvider" )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.CmisContentProvider" )) ); + rtl::OUString("com.sun.star.comp.CmisContentProvider"), + rtl::OUString("com.sun.star.ucb.CmisContentProvider") ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index b76514c0b79a..18877c8a53e6 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -84,7 +84,7 @@ namespace cmis uno::Any RepoContent::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong argument type!")), + rtl::OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -203,16 +203,16 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + beans::Property( rtl::OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + beans::Property( rtl::OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + beans::Property( rtl::OUString( "Title" ), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ), + beans::Property( rtl::OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -228,21 +228,21 @@ namespace cmis { // 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 * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + ( rtl::OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // Optional standard commands ucb::CommandInfo - ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + ( rtl::OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), }; @@ -280,20 +280,20 @@ namespace cmis rtl::OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.CmisRepoContent")); + return rtl::OUString("com.sun.star.comp.CmisRepoContent"); } uno::Sequence< rtl::OUString > SAL_CALL RepoContent::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Content")); + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.Content"; return aSNS; } rtl::OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException ) { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMIS_REPO_TYPE ) ); + return rtl::OUString( CMIS_REPO_TYPE ); } uno::Any SAL_CALL RepoContent::execute( diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx index 4e0e28850b03..1f53b4a1035c 100644 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ b/ucbhelper/source/client/fileidentifierconverter.cxx @@ -44,7 +44,7 @@ getLocalFileURL() SAL_THROW((uno::RuntimeException)) // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for // their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality // and return the most local one: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///")); + return rtl::OUString("file:///"); } //============================================================================ diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index 8b2e5e0f926c..bc7990d4a6d1 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -52,9 +52,7 @@ registerAtUcb( OSL_ENSURE(rServiceFactory.is(), "ucb::registerAtUcb(): No service factory"); - bool bNoProxy - = rArguments.compareToAscii(RTL_CONSTASCII_STRINGPARAM("{noproxy}")) - == 0; + bool bNoProxy = rArguments.compareTo("{noproxy}") == 0; rtl::OUString aProviderArguments(bNoProxy ? rArguments. @@ -70,7 +68,7 @@ registerAtUcb( { uno::Reference< beans::XPropertySet > xFactoryProperties( rServiceFactory, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext = uno::Reference< uno::XComponentContext >( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), + xFactoryProperties->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ), uno::UNO_QUERY ); xProxyFactory = uno::Reference< ucb::XContentProviderFactory >( -- cgit