diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-01 13:18:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-01 12:34:51 +0000 |
| commit | 39414827352e58e8be76abaa9a5a1ac9518d927f (patch) | |
| tree | 7b856026bae224c678cab020ce00f97574d2bbba /sal | |
| parent | d5c4823555e6f5c4e3bd9258c819bb2a763227c4 (diff) | |
loplugin:oncevar in sal..scripting
Change-Id: Id9ab12f3a61eb83a2288b2fd4d99ab77f5833e1b
Reviewed-on: https://gerrit.libreoffice.org/30461
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/process/osl_Thread.cxx | 3 | ||||
| -rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 8f42ae4080e5..32840a69c80c 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -1843,8 +1843,7 @@ namespace osl_ThreadData void getData_001() { char* pc = new char[2]; - char nData[] = "i"; - strcpy(pc, nData); + strcpy(pc, "i"); myThreadData.setData(pc); myKeyThread aThread1('c'); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 475b09750826..d97b25190403 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -66,12 +66,6 @@ # endif #endif -#if defined(_WIN32) - const rtl::OUStringLiteral EXECUTABLE_NAME ("osl_process_child.exe"); -#else - const rtl::OUStringLiteral EXECUTABLE_NAME ("osl_process_child"); -#endif - using namespace osl; using ::rtl::OUString; @@ -184,7 +178,12 @@ public: { parameters_[0] = env_param_.pData; suCWD = getExecutablePath(); - suExecutableFileURL = suCWD + "/" + EXECUTABLE_NAME; + +#if defined(_WIN32) + suExecutableFileURL = suCWD + "/" "osl_process_child.exe"; +#else + suExecutableFileURL = suCWD + "/" "osl_process_child"; +#endif } virtual void setUp() override |