diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-30 23:42:46 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-30 23:43:08 -0500 |
commit | fa1da8256c136e697f7b02d0dfeae9cfbe583d88 (patch) | |
tree | 8635896e3ad64c17473689345609c407d0f53c9d /unotools | |
parent | Unit test for INDIRECT function with different configurations. (diff) | |
download | core-fa1da8256c136e697f7b02d0dfeae9cfbe583d88.tar.gz core-fa1da8256c136e697f7b02d0dfeae9cfbe583d88.zip |
targeted string re-work
Change-Id: I3ef48c34e9e0e1c0e567b013b55a630ee1c7e9c5
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/confignode.cxx | 8 | ||||
-rw-r--r-- | unotools/source/config/docinfohelper.cxx | 4 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 9888490e2af8..3c290d7ab88f 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -349,7 +349,7 @@ namespace utl Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY); if (xSI.is()) { - try { bIsSet = xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.SetAccess"))); } + try { bIsSet = xSI->supportsService(::rtl::OUString("com.sun.star.configuration.SetAccess")); } catch(Exception&) { } } return bIsSet; @@ -491,7 +491,7 @@ namespace utl //-------------------------------------------------------------------- static const ::rtl::OUString& lcl_getProviderServiceName( ) { - static ::rtl::OUString s_sProviderServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ); + static ::rtl::OUString s_sProviderServiceName( "com.sun.star.configuration.ConfigurationProvider" ); return s_sProviderServiceName; } @@ -523,8 +523,8 @@ namespace utl aArgs.put( "depth", i_nDepth ); ::rtl::OUString sAccessService( i_bUpdatable ? - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" )) : - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ))); + ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) : + ::rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" )); Reference< XInterface > xRoot( i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ), diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx index b44e7638b882..d8aa666e9ec7 100644 --- a/unotools/source/config/docinfohelper.cxx +++ b/unotools/source/config/docinfohelper.cxx @@ -66,8 +66,8 @@ namespace utl } } - ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") ); - ::rtl::OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") ); + ::rtl::OUString os( "$_OS" ); + ::rtl::OUString arch( "$_ARCH" ); ::rtl::Bootstrap::expandMacros(os); ::rtl::Bootstrap::expandMacros(arch); aResult.append( (sal_Unicode)'$' ); diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 679d83ecfdd2..5db66389bb56 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1027,9 +1027,7 @@ static sal_Bool UCBOpenContentSync( aExcep.Server = aURL.GetHost(); aExcep.Classification = InteractionClassification_ERROR; aExcep.Message = - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "server not responding after five seconds")); + rtl::OUString( "server not responding after five seconds"); Any request; request <<= aExcep; ucbhelper::InteractionRequest *ir = @@ -1335,7 +1333,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp { Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); Reference< XOutputStream > rxTempOut = Reference < XOutputStream > ( - xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), + xFactory->createInstance ( ::rtl::OUString("com.sun.star.io.TempFile") ), UNO_QUERY ); if( rxTempOut.is() ) @@ -1680,7 +1678,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo { Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY ); Command aCommand; - aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); + aCommand.Name = ::rtl::OUString("setPropertyValues"); aCommand.Handle = -1; /* unknown */ aCommand.Argument <<= rProps; xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() ); @@ -1691,7 +1689,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo aArgument.Mode = OpenMode::DOCUMENT; Command aCommand; - aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("open") ); + aCommand.Name = ::rtl::OUString( "open" ); aCommand.Argument <<= aArgument; Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); |