mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targeted string re-work

Browse Source 
Change-Id: I3ef48c34e9e0e1c0e567b013b55a630ee1c7e9c5
This commit is contained in:
Norbert Thiebaud
2012-05-30 23:42:46 -05:00
parent 2f3f14608d
commit fa1da8256c
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unotools/source/config/confignode.cxx
View File

@@ -349,7 +349,7 @@ namespace utl
Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY); Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY);
if (xSI.is()) 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&) { } catch(Exception&) { }
} }
return bIsSet; return bIsSet;
@@ -491,7 +491,7 @@ namespace utl
//-------------------------------------------------------------------- //--------------------------------------------------------------------
static const ::rtl::OUString& lcl_getProviderServiceName( ) 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; return s_sProviderServiceName;
} }
@@ -523,8 +523,8 @@ namespace utl
aArgs.put( "depth", i_nDepth ); aArgs.put( "depth", i_nDepth );
::rtl::OUString sAccessService( i_bUpdatable ? ::rtl::OUString sAccessService( i_bUpdatable ?
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" )) : ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) :
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ))); ::rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ));
Reference< XInterface > xRoot( Reference< XInterface > xRoot(
i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ), i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ),

4
unotools/source/config/docinfohelper.cxx
View File

@@ -66,8 +66,8 @@ namespace utl
} }
} }
::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") ); ::rtl::OUString os( "$_OS" );
::rtl::OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") ); ::rtl::OUString arch( "$_ARCH" );
::rtl::Bootstrap::expandMacros(os); ::rtl::Bootstrap::expandMacros(os);
::rtl::Bootstrap::expandMacros(arch); ::rtl::Bootstrap::expandMacros(arch);
aResult.append( (sal_Unicode)'$' ); aResult.append( (sal_Unicode)'$' );

10
unotools/source/ucbhelper/ucblockbytes.cxx
View File

@@ -1027,9 +1027,7 @@ static sal_Bool UCBOpenContentSync(
aExcep.Server = aURL.GetHost(); aExcep.Server = aURL.GetHost();
aExcep.Classification = InteractionClassification_ERROR; aExcep.Classification = InteractionClassification_ERROR;
aExcep.Message = aExcep.Message =
rtl::OUString( rtl::OUString( "server not responding after five seconds");
RTL_CONSTASCII_USTRINGPARAM(
"server not responding after five seconds"));
Any request; Any request;
request <<= aExcep; request <<= aExcep;
ucbhelper::InteractionRequest *ir = ucbhelper::InteractionRequest *ir =
@@ -1335,7 +1333,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp
{ {
Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
Reference< XOutputStream > rxTempOut = Reference < XOutputStream > ( 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 ); UNO_QUERY );
if( rxTempOut.is() ) if( rxTempOut.is() )
@@ -1680,7 +1678,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
{ {
Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY ); Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY );
Command aCommand; Command aCommand;
aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Name = ::rtl::OUString("setPropertyValues");
aCommand.Handle = -1; /* unknown */ aCommand.Handle = -1; /* unknown */
aCommand.Argument <<= rProps; aCommand.Argument <<= rProps;
xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() ); xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() );
@@ -1691,7 +1689,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
aArgument.Mode = OpenMode::DOCUMENT; aArgument.Mode = OpenMode::DOCUMENT;
Command aCommand; Command aCommand;
aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("open") ); aCommand.Name = ::rtl::OUString( "open" );
aCommand.Argument <<= aArgument; aCommand.Argument <<= aArgument;
Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) );