summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 09:36:42 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 09:36:42 +0100
commit369be908c37ca0d062ab94355b01badc51f793fa (patch)
treed4dddb9878c2d53c7fa3cf125958503d27ddbb7b /sal
parent8b6ed2d28861de44a580d0c743d485df70c48913 (diff)
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I95283ccf78e4ca699e88ea226d38153a8a92845a
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/osl/file/osl_File.cxx20
-rw-r--r--sal/rtl/bootstrap.cxx4
2 files changed, 12 insertions, 12 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index ff70ae43758a..a0c5fc53d658 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -491,29 +491,29 @@ namespace osl_FileBase
void getAbsoluteFileURL::getAbsoluteFileURL_001_1()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative/file1") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file1" );
check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",::osl::FileBase::E_None, suAssume );
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_2()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative/file2") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file2" );
check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",::osl::FileBase::E_None, suAssume );
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_3()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/file3") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/file3" );
check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",::osl::FileBase::E_None, suAssume );
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_4()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/file4") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/file4" );
check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",::osl::FileBase::E_None, suAssume );
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_5()
{
rtl::OUString suAssume;
#if ( defined UNX )
- suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative/") );
+ suAssume = aUserDirectoryURL.concat( "/relative/" );
#else
suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative") );
#endif
@@ -521,14 +521,14 @@ namespace osl_FileBase
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_6()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/.relative") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/.relative" );
check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",::osl::FileBase::E_None, suAssume );
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_7()
{
rtl::OUString suAssume;
#if (defined UNX )
- suAssume = aUserDirectoryURL.concat( rtl::OUString("/.a/") );
+ suAssume = aUserDirectoryURL.concat( "/.a/" );
#else //windows
suAssume = aUserDirectoryURL.concat( rtl::OUString("/.a") );
#endif
@@ -536,7 +536,7 @@ namespace osl_FileBase
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/tmp/ok") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/tmp/ok" );
#if ( defined UNX )
check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume );
#else
@@ -558,7 +558,7 @@ namespace osl_FileBase
sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
CPPUNIT_ASSERT( fd == 0 );
rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US );
- rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString("/canonical.name") );
+ rtl::OUString suAssume = aUserDirectoryURL.concat( "/canonical.name" );
check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, ::osl::FileBase::E_None, suAssume );
deleteTestFile( aCanURL1 );
fd = remove( strLinkFileName.getStr() );
@@ -577,7 +577,7 @@ namespace osl_FileBase
::rtl::OUString aUStrBase = aUserDirectoryURL + "/test1/dir1";
createTestDirectory( aUStrBase );
- ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString("/mytestfile") );
+ ::rtl::OUString suAssume = aUserDirectoryURL.concat( "/mytestfile" );
check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , ::osl::FileBase::E_None, suAssume );
deleteTestDirectory( aUStrBase );
deleteTestDirectory( aUStrUpBase );
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index e7874db098ea..e41b89aae062 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -250,7 +250,7 @@ static OUString & getIniFileName_Impl()
resolvePathnameUrl(&fileName);
#else
if(getFromCommandLineArgs(
- OUString("INIFILENAME"), &fileName))
+ "INIFILENAME", &fileName))
{
resolvePathnameUrl(&fileName);
}
@@ -433,7 +433,7 @@ struct FundamentalIniData: private boost::noncopyable {
ini =
((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())->
getValue(
- rtl::OUString("URE_BOOTSTRAP"),
+ "URE_BOOTSTRAP",
&uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) &&
resolvePathnameUrl(&uri))
? rtl_bootstrap_args_open(uri.pData) : NULL;