Kaydet (Commit) 8437b42c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:stringconstant: handle OUString+=OUString(literal)

Change-Id: Ia304622214c47d35387dd0393db8e9afa55118f2
üst 63e81af3
...@@ -547,8 +547,8 @@ namespace osl_FileBase ...@@ -547,8 +547,8 @@ namespace osl_FileBase
{ {
#if ( defined UNX ) //Link is not defined in Windows #if ( defined UNX ) //Link is not defined in Windows
::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/link.file"); aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file";
( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/canonical.name"); aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/canonical.name";
rtl::OString strLinkFileName, strSrcFileName; rtl::OString strLinkFileName, strSrcFileName;
strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
...@@ -1432,8 +1432,8 @@ namespace osl_FileStatus ...@@ -1432,8 +1432,8 @@ namespace osl_FileStatus
sal_Int32 fd; sal_Int32 fd;
::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/tmpdir/link.file"); aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/tmpdir/link.file";
( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/tmpdir/tmpname"); aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/tmpdir/tmpname";
rtl::OString strLinkFileName; rtl::OString strLinkFileName;
rtl::OString strSrcFileName; rtl::OString strSrcFileName;
...@@ -2053,8 +2053,8 @@ namespace osl_FileStatus ...@@ -2053,8 +2053,8 @@ namespace osl_FileStatus
{ {
//create a link file; //create a link file;
::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/link.file"); aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file";
( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID() ) += ::rtl::OUString("/tmpname"); aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/tmpname";
rtl::OString strLinkFileName, strSrcFileName; rtl::OString strLinkFileName, strSrcFileName;
strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
...@@ -4406,8 +4406,8 @@ namespace osl_Directory ...@@ -4406,8 +4406,8 @@ namespace osl_Directory
bool bFoundOK = false; bool bFoundOK = false;
::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
( aUStr_LnkFileSys += aSlashURL ) += ::rtl::OUString("/tmpdir/link.file"); aUStr_LnkFileSys += aSlashURL + "/tmpdir/link.file";
( aUStr_SrcFileSys += aSlashURL ) += ::rtl::OUString("/tmpdir/tmpname"); aUStr_SrcFileSys += aSlashURL + "/tmpdir/tmpname";
::rtl::OString strLinkFileName, strSrcFileName; ::rtl::OString strLinkFileName, strSrcFileName;
strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
......
...@@ -87,7 +87,7 @@ inline ::rtl::OUString getExecutablePath() ...@@ -87,7 +87,7 @@ inline ::rtl::OUString getExecutablePath()
reinterpret_cast<oslGenericFunction>(&getExecutablePath), dirPath); reinterpret_cast<oslGenericFunction>(&getExecutablePath), dirPath);
dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') ); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') );
dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
dirPath += rtl::OUString("Executable"); dirPath += "Executable";
return dirPath; return dirPath;
} }
...@@ -199,9 +199,7 @@ public: ...@@ -199,9 +199,7 @@ public:
{ {
parameters_[0] = env_param_.pData; parameters_[0] = env_param_.pData;
suCWD = getExecutablePath(); suCWD = getExecutablePath();
suExecutableFileURL = suCWD; suExecutableFileURL = suCWD + "/" + EXECUTABLE_NAME;
suExecutableFileURL += rtl::OUString("/");
suExecutableFileURL += EXECUTABLE_NAME;
} }
virtual void setUp() SAL_OVERRIDE virtual void setUp() SAL_OVERRIDE
......
...@@ -62,7 +62,7 @@ inline ::rtl::OUString getModulePath() ...@@ -62,7 +62,7 @@ inline ::rtl::OUString getModulePath()
printUString(suDirPath, "modulePath:"); printUString(suDirPath, "modulePath:");
suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') ); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
suDirPath += rtl::OUString("bin"); suDirPath += "bin";
return suDirPath; return suDirPath;
} }
...@@ -103,9 +103,7 @@ public: ...@@ -103,9 +103,7 @@ public:
pParameters[2] = suParam2.pData; pParameters[2] = suParam2.pData;
pParameters[3] = suParam3.pData; pParameters[3] = suParam3.pData;
rtl::OUString suFileURL = suCWD; rtl::OUString suFileURL = suCWD + "/" + EXECUTABLE_NAME;
suFileURL += rtl::OUString("/");
suFileURL += EXECUTABLE_NAME;
oslProcessError osl_error = osl_executeProcess( oslProcessError osl_error = osl_executeProcess(
suFileURL.pData, suFileURL.pData,
...@@ -232,9 +230,7 @@ public: ...@@ -232,9 +230,7 @@ public:
rtl::OUString suCWD = getModulePath(); rtl::OUString suCWD = getModulePath();
oslProcess hProcess = NULL; oslProcess hProcess = NULL;
rtl::OUString suFileURL = suCWD; rtl::OUString suFileURL = suCWD + "/" + EXEC_NAME;
suFileURL += rtl::OUString("/");
suFileURL += EXEC_NAME;
oslFileHandle* pChildOutputRead = new oslFileHandle(); oslFileHandle* pChildOutputRead = new oslFileHandle();
oslProcessError osl_error = osl_executeProcess_WithRedirectedIO( oslProcessError osl_error = osl_executeProcess_WithRedirectedIO(
suFileURL.pData, suFileURL.pData,
......
...@@ -270,7 +270,7 @@ static OUString & getIniFileName_Impl() ...@@ -270,7 +270,7 @@ static OUString & getIniFileName_Impl()
fileName = fileName.copy(0, fileName.getLength() - progExt.getLength()); fileName = fileName.copy(0, fileName.getLength() - progExt.getLength());
// append config file suffix // append config file suffix
fileName += OUString(SAL_CONFIGFILE("")); fileName += SAL_CONFIGFILE("");
#ifdef MACOSX #ifdef MACOSX
// We keep only executables in the MacOS folder, and all // We keep only executables in the MacOS folder, and all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment