Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
8437b42c
Kaydet (Commit)
8437b42c
authored
Haz 26, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:stringconstant: handle OUString+=OUString(literal)
Change-Id: Ia304622214c47d35387dd0393db8e9afa55118f2
üst
63e81af3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
20 deletions
+14
-20
osl_File.cxx
sal/qa/osl/file/osl_File.cxx
+8
-8
osl_process.cxx
sal/qa/osl/process/osl_process.cxx
+2
-4
rtl_Process.cxx
sal/qa/rtl/process/rtl_Process.cxx
+3
-7
bootstrap.cxx
sal/rtl/bootstrap.cxx
+1
-1
No files found.
sal/qa/osl/file/osl_File.cxx
Dosyayı görüntüle @
8437b42c
...
...
@@ -547,8 +547,8 @@ namespace osl_FileBase
{
#if ( defined UNX ) //Link is not defined in Windows
::
rtl
::
OUString
aUStr_LnkFileSys
(
aTempDirectorySys
),
aUStr_SrcFileSys
(
aTempDirectorySys
);
(
(
aUStr_LnkFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/link.file"
)
;
(
(
aUStr_SrcFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/canonical.name"
)
;
aUStr_LnkFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/link.file"
;
aUStr_SrcFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/canonical.name"
;
rtl
::
OString
strLinkFileName
,
strSrcFileName
;
strLinkFileName
=
OUStringToOString
(
aUStr_LnkFileSys
,
RTL_TEXTENCODING_ASCII_US
);
...
...
@@ -1432,8 +1432,8 @@ namespace osl_FileStatus
sal_Int32
fd
;
::
rtl
::
OUString
aUStr_LnkFileSys
(
aTempDirectorySys
),
aUStr_SrcFileSys
(
aTempDirectorySys
);
(
(
aUStr_LnkFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/tmpdir/link.file"
)
;
(
(
aUStr_SrcFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/tmpdir/tmpname"
)
;
aUStr_LnkFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/tmpdir/link.file"
;
aUStr_SrcFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/tmpdir/tmpname"
;
rtl
::
OString
strLinkFileName
;
rtl
::
OString
strSrcFileName
;
...
...
@@ -2053,8 +2053,8 @@ namespace osl_FileStatus
{
//create a link file;
::
rtl
::
OUString
aUStr_LnkFileSys
(
aTempDirectorySys
),
aUStr_SrcFileSys
(
aTempDirectorySys
);
(
(
aUStr_LnkFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/link.file"
)
;
(
(
aUStr_SrcFileSys
+=
aSlashURL
)
+=
getCurrentPID
()
)
+=
::
rtl
::
OUString
(
"/tmpname"
)
;
aUStr_LnkFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/link.file"
;
aUStr_SrcFileSys
+=
aSlashURL
+
getCurrentPID
()
+
"/tmpname"
;
rtl
::
OString
strLinkFileName
,
strSrcFileName
;
strLinkFileName
=
OUStringToOString
(
aUStr_LnkFileSys
,
RTL_TEXTENCODING_ASCII_US
);
...
...
@@ -4406,8 +4406,8 @@ namespace osl_Directory
bool
bFoundOK
=
false
;
::
rtl
::
OUString
aUStr_LnkFileSys
(
aTempDirectorySys
),
aUStr_SrcFileSys
(
aTempDirectorySys
);
(
aUStr_LnkFileSys
+=
aSlashURL
)
+=
::
rtl
::
OUString
(
"/tmpdir/link.file"
)
;
(
aUStr_SrcFileSys
+=
aSlashURL
)
+=
::
rtl
::
OUString
(
"/tmpdir/tmpname"
)
;
aUStr_LnkFileSys
+=
aSlashURL
+
"/tmpdir/link.file"
;
aUStr_SrcFileSys
+=
aSlashURL
+
"/tmpdir/tmpname"
;
::
rtl
::
OString
strLinkFileName
,
strSrcFileName
;
strLinkFileName
=
OUStringToOString
(
aUStr_LnkFileSys
,
RTL_TEXTENCODING_ASCII_US
);
...
...
sal/qa/osl/process/osl_process.cxx
Dosyayı görüntüle @
8437b42c
...
...
@@ -87,7 +87,7 @@ inline ::rtl::OUString getExecutablePath()
reinterpret_cast
<
oslGenericFunction
>
(
&
getExecutablePath
),
dirPath
);
dirPath
=
dirPath
.
copy
(
0
,
dirPath
.
lastIndexOf
(
'/'
)
);
dirPath
=
dirPath
.
copy
(
0
,
dirPath
.
lastIndexOf
(
'/'
)
+
1
);
dirPath
+=
rtl
::
OUString
(
"Executable"
)
;
dirPath
+=
"Executable"
;
return
dirPath
;
}
...
...
@@ -199,9 +199,7 @@ public:
{
parameters_
[
0
]
=
env_param_
.
pData
;
suCWD
=
getExecutablePath
();
suExecutableFileURL
=
suCWD
;
suExecutableFileURL
+=
rtl
::
OUString
(
"/"
);
suExecutableFileURL
+=
EXECUTABLE_NAME
;
suExecutableFileURL
=
suCWD
+
"/"
+
EXECUTABLE_NAME
;
}
virtual
void
setUp
()
SAL_OVERRIDE
...
...
sal/qa/rtl/process/rtl_Process.cxx
Dosyayı görüntüle @
8437b42c
...
...
@@ -62,7 +62,7 @@ inline ::rtl::OUString getModulePath()
printUString
(
suDirPath
,
"modulePath:"
);
suDirPath
=
suDirPath
.
copy
(
0
,
suDirPath
.
lastIndexOf
(
'/'
)
);
suDirPath
=
suDirPath
.
copy
(
0
,
suDirPath
.
lastIndexOf
(
'/'
)
+
1
);
suDirPath
+=
rtl
::
OUString
(
"bin"
)
;
suDirPath
+=
"bin"
;
return
suDirPath
;
}
...
...
@@ -103,9 +103,7 @@ public:
pParameters
[
2
]
=
suParam2
.
pData
;
pParameters
[
3
]
=
suParam3
.
pData
;
rtl
::
OUString
suFileURL
=
suCWD
;
suFileURL
+=
rtl
::
OUString
(
"/"
);
suFileURL
+=
EXECUTABLE_NAME
;
rtl
::
OUString
suFileURL
=
suCWD
+
"/"
+
EXECUTABLE_NAME
;
oslProcessError
osl_error
=
osl_executeProcess
(
suFileURL
.
pData
,
...
...
@@ -232,9 +230,7 @@ public:
rtl
::
OUString
suCWD
=
getModulePath
();
oslProcess
hProcess
=
NULL
;
rtl
::
OUString
suFileURL
=
suCWD
;
suFileURL
+=
rtl
::
OUString
(
"/"
);
suFileURL
+=
EXEC_NAME
;
rtl
::
OUString
suFileURL
=
suCWD
+
"/"
+
EXEC_NAME
;
oslFileHandle
*
pChildOutputRead
=
new
oslFileHandle
();
oslProcessError
osl_error
=
osl_executeProcess_WithRedirectedIO
(
suFileURL
.
pData
,
...
...
sal/rtl/bootstrap.cxx
Dosyayı görüntüle @
8437b42c
...
...
@@ -270,7 +270,7 @@ static OUString & getIniFileName_Impl()
fileName
=
fileName
.
copy
(
0
,
fileName
.
getLength
()
-
progExt
.
getLength
());
// append config file suffix
fileName
+=
OUString
(
SAL_CONFIGFILE
(
""
)
);
fileName
+=
SAL_CONFIGFILE
(
""
);
#ifdef MACOSX
// We keep only executables in the MacOS folder, and all
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment