diff options
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/w32/path_helper.cxx | 6 | ||||
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index a2dd134fded9..23a2412d91ac 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -25,8 +25,8 @@ #include <algorithm> #include <wchar.h> -constexpr OUStringLiteral BACKSLASH (u"\\"); -constexpr OUStringLiteral SLASH (u"/"); +constexpr OUString BACKSLASH (u"\\"_ustr); +constexpr OUString SLASH (u"/"_ustr); void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath) { @@ -57,7 +57,7 @@ void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath) if (i > -1 && (i == (path.getLength() - 1))) { - path = OUString(path.getStr(), path.getLength() - 1); + path = path.copy(0, path.getLength() - 1); rtl_uString_assign(ppustrPath, path.pData); } } diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 1689d6ac6be9..a9a7b95cc2ce 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -344,11 +344,10 @@ namespace /* private */ ext.equalsIgnoreAsciiCase("btm")); } - const OUString ENV_COMSPEC ("COMSPEC"); OUString get_batch_processor() { OUString comspec; - osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData); + osl_getEnvironment(u"COMSPEC"_ustr.pData, &comspec.pData); OSL_ASSERT(comspec.getLength()); |