diff options
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/file_dirvol.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/socket.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index bf8e8fbcd9d6..71cee43ffad8 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -174,7 +174,7 @@ namespace } else { - has_parent = !osl::systemPathIsLogicalDrivePattern(path); + has_parent = !osl::systemPathIsLogicalDrivePattern(OUString(path)); } return has_parent; } diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 25b356a74d0b..5fb9a46348b2 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -102,7 +102,7 @@ namespace /* private */ while (size_t l = wcslen(p)) { - environment->push_back(o3tl::toU(p)); + environment->push_back(OUString(o3tl::toU(p))); p += l + 1; } FreeEnvironmentStringsW(env); diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 52f6738e8205..f1c46e8f2568 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -651,7 +651,7 @@ oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname) if (rtl_ustr_getLength(LocalHostname) > 0) { - return {osl_Socket_Ok, LocalHostname}; + return {osl_Socket_Ok, OUString(LocalHostname)}; } return {osl_Socket_Error, OUString()}; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 9bf73c421d45..32eafc2f6db2 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4975,14 +4975,14 @@ namespace osl_Directory if (i == path.getLength()) buffer[i] = 0; - Directory::remove(buffer); + Directory::remove(OUString(buffer)); i = rtl_ustr_lastIndexOfChar(buffer, '/'); assert(i != -1); if (i != -1) { buffer[i] = 0; - Directory::remove(buffer); + Directory::remove(OUString(buffer)); } } diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 0026975fa760..b5e46ee3eccd 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -389,7 +389,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, if ( ( lRet == ERROR_SUCCESS ) && ( Type == REG_SZ ) && ( _waccess( o3tl::toW(PathW), 0 ) == 0 ) ) { CPPUNIT_ASSERT_EQUAL_MESSAGE( "#Convert from system path to URL failed.", - ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( PathW, strConfigDirectory ) ); + ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString(PathW), strConfigDirectory ) ); } lSize = sizeof(PathW); @@ -397,7 +397,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, if ( ( lRet == ERROR_SUCCESS ) && ( Type == REG_SZ ) && ( _waccess( o3tl::toW(PathW), 0 ) == 0 ) ) { CPPUNIT_ASSERT_EQUAL_MESSAGE( "#Convert from system path to URL failed.", - ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( PathW, strHomeDirectory ) ); + ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString(PathW), strHomeDirectory ) ); } RegCloseKey(hRegKey); |