summaryrefslogtreecommitdiff
path: root/sal/osl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/osl')
-rw-r--r--sal/osl/all/debugbase.cxx10
-rw-r--r--sal/osl/all/loadmodulerelative.cxx4
-rw-r--r--sal/osl/unx/file_misc.cxx8
-rw-r--r--sal/osl/unx/file_path_helper.cxx40
-rw-r--r--sal/osl/unx/file_path_helper.hxx20
-rw-r--r--sal/osl/unx/file_stat.cxx20
-rw-r--r--sal/osl/unx/file_url.cxx36
-rw-r--r--sal/osl/unx/nlsupport.cxx4
-rw-r--r--sal/osl/unx/nlsupport.hxx2
-rw-r--r--sal/osl/unx/osxlocale.cxx6
-rw-r--r--sal/osl/unx/process.cxx14
-rw-r--r--sal/osl/unx/process_impl.cxx2
-rw-r--r--sal/osl/unx/uunxapi.cxx22
-rw-r--r--sal/osl/unx/uunxapi.hxx10
-rw-r--r--sal/osl/w32/file_dirvol.cxx38
-rw-r--r--sal/osl/w32/file_url.cxx8
-rw-r--r--sal/osl/w32/path_helper.cxx10
-rw-r--r--sal/osl/w32/path_helper.hxx6
-rw-r--r--sal/osl/w32/procimpl.cxx58
19 files changed, 159 insertions, 159 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index fe5affc9d069..209dc55e1e32 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -34,14 +34,14 @@ struct StaticDebugBaseAddressFilter
std::vector<OString> operator()() const {
std::vector<OString> vec;
rtl_uString * pStr = nullptr;
- rtl::OUString const name(
+ OUString const name(
"OSL_DEBUGBASE_STORE_ADDRESSES" );
if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) {
- rtl::OUString const str(pStr);
+ OUString const str(pStr);
rtl_uString_release(pStr);
sal_Int32 nIndex = 0;
do {
- vec.push_back( rtl::OUStringToOString(
+ vec.push_back( OUStringToOString(
str.getToken( 0, ';', nIndex ),
RTL_TEXTENCODING_ASCII_US ) );
}
@@ -51,7 +51,7 @@ struct StaticDebugBaseAddressFilter
}
};
-bool isSubStr( char const* pStr, rtl::OString const& subStr )
+bool isSubStr( char const* pStr, OString const& subStr )
{
return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
}
@@ -85,7 +85,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName )
if (rVec.empty())
return false;
// check for "all":
- rtl::OString const& rFirst = rVec[0];
+ OString const& rFirst = rVec[0];
if ( rFirst == "all" )
return true;
auto const iEnd( rVec.cend() );
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 30c7d600674d..242bb6210a76 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -38,12 +38,12 @@ oslModule SAL_CALL osl_loadModuleRelative(
oslGenericFunction const baseModule, rtl_uString * const relativePath,
sal_Int32 const mode)
{
- rtl::OUString base;
+ OUString base;
if (!osl::Module::getUrlFromAddress(baseModule, base)) {
SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed");
return nullptr;
}
- rtl::OUString abs;
+ OUString abs;
try {
abs = rtl::Uri::convertRelToAbs(base, relativePath);
} catch (const rtl::MalformedUriException & e) {
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 05e72997070b..fb12e4155e14 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -519,7 +519,7 @@ static int create_dir_with_callback(
{
if (aDirectoryCreationCallbackFunc)
{
- rtl::OUString url;
+ OUString url;
osl::FileBase::getFileURLFromSystemPath(directory_path, url);
aDirectoryCreationCallbackFunc(pData, url.pData);
}
@@ -570,7 +570,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
if (aDirectoryUrl == nullptr)
return osl_File_E_INVAL;
- rtl::OUString sys_path;
+ OUString sys_path;
oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(aDirectoryUrl, &sys_path.pData);
if (osl_error != osl_File_E_None)
@@ -811,12 +811,12 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
{
int nRet=0;
- rtl::OString tmpDestFile;
+ OString tmpDestFile;
if ( DestFileExists )
{
//TODO: better pick a temp file name instead of adding .osl-tmp:
// use the destination file to avoid EXDEV /* Cross-device link */
- tmpDestFile = rtl::OString(pszDestFileName) + ".osl-tmp";
+ tmpDestFile = OString(pszDestFileName) + ".osl-tmp";
if (rename(pszDestFileName, tmpDestFile.getStr()) != 0)
{
int e = errno;
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 923b588a20c9..7fc2effb5f03 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -28,14 +28,14 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/';
const sal_Unicode FPH_CHAR_DOT = '.';
const sal_Unicode FPH_CHAR_COLON = ':';
-static const rtl::OUString FPH_PATH_SEPARATOR()
-{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
+static const OUString FPH_PATH_SEPARATOR()
+{ return OUString(FPH_CHAR_PATH_SEPARATOR); }
-static const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-{ return rtl::OUString(FPH_CHAR_DOT); }
+static const OUString FPH_LOCAL_DIR_ENTRY()
+{ return OUString(FPH_CHAR_DOT); }
-static const rtl::OUString FPH_PARENT_DIR_ENTRY()
-{ return rtl::OUString(".."); }
+static const OUString FPH_PARENT_DIR_ENTRY()
+{ return OUString(".."); }
void osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
{
@@ -62,7 +62,7 @@ void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter");
if ((ppustrPath != nullptr) && (*ppustrPath != nullptr))
{
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
sal_Int32 lp = path.getLength();
sal_Int32 i = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
@@ -89,8 +89,8 @@ void osl_systemPathMakeAbsolutePath(
const rtl_uString* pustrRelPath,
rtl_uString** ppustrAbsolutePath)
{
- rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
- rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
+ OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
+ OUString rel(const_cast<rtl_uString*>(pustrRelPath));
if (!base.isEmpty())
osl_systemPathEnsureSeparator(&base.pData);
@@ -108,11 +108,11 @@ void osl_systemPathGetFileNameOrLastDirectoryPart(
OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart,
"osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
- rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
+ OUString path(const_cast<rtl_uString*>(pustrPath));
osl_systemPathRemoveSeparator(path.pData);
- rtl::OUString last_part;
+ OUString last_part;
if (path.getLength() > 1 || (path.getLength() == 1 && path[0] != FPH_CHAR_PATH_SEPARATOR))
{
@@ -130,7 +130,7 @@ bool osl_systemPathIsHiddenFileOrDirectoryEntry(
if ((pustrPath == nullptr) || (pustrPath->length == 0))
return false;
- rtl::OUString fdp;
+ OUString fdp;
osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
return ((fdp.pData->length > 0) &&
@@ -143,7 +143,7 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry(
{
OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
- rtl::OUString dirent;
+ OUString dirent;
osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
@@ -161,7 +161,7 @@ public:
returns the first path in list, no need
to call reset first
*/
- path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
+ path_list_iterator(const OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
m_path_list(path_list),
m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
m_separator(list_separator)
@@ -191,9 +191,9 @@ public:
return (m_path_segment_end >= m_end);
}
- rtl::OUString get_current_item() const
+ OUString get_current_item() const
{
- return rtl::OUString(
+ return OUString(
m_path_segment_begin,
(m_path_segment_end - m_path_segment_begin));
}
@@ -211,7 +211,7 @@ private:
}
private:
- rtl::OUString const m_path_list;
+ OUString const m_path_list;
const sal_Unicode* m_end;
const sal_Unicode m_separator;
const sal_Unicode* m_path_segment_begin;
@@ -226,13 +226,13 @@ bool osl_searchPath(
OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
bool bfound = false;
- rtl::OUString fp(const_cast<rtl_uString*>(pustrFilePath));
- rtl::OUString pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
+ OUString fp(const_cast<rtl_uString*>(pustrFilePath));
+ OUString pl = OUString(const_cast<rtl_uString*>(pustrSearchPathList));
path_list_iterator pli(pl);
while (!pli.done())
{
- rtl::OUString p = pli.get_current_item();
+ OUString p = pli.get_current_item();
osl::systemPathEnsureSeparator(p);
p += fp;
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 2b2fd8891256..18af761cb310 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -184,7 +184,7 @@ namespace osl
******************************************/
- inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
{
osl_systemPathRemoveSeparator(Path.pData);
}
@@ -206,7 +206,7 @@ namespace osl
******************************************/
- inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+ inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
{
osl_systemPathEnsureSeparator(&Path.pData);
}
@@ -225,7 +225,7 @@ namespace osl
******************************************/
- inline bool systemPathIsRelativePath(const rtl::OUString& Path)
+ inline bool systemPathIsRelativePath(const OUString& Path)
{
return osl_systemPathIsRelativePath(Path.pData);
}
@@ -265,9 +265,9 @@ namespace osl
*****************************************/
inline void systemPathMakeAbsolutePath(
- const rtl::OUString& BasePath,
- const rtl::OUString& RelPath,
- rtl::OUString& AbsolutePath)
+ const OUString& BasePath,
+ const OUString& RelPath,
+ OUString& AbsolutePath)
{
osl_systemPathMakeAbsolutePath(
BasePath.pData, RelPath.pData, &AbsolutePath.pData);
@@ -291,7 +291,7 @@ namespace osl
*********************************************/
inline bool systemPathIsHiddenFileOrDirectoryEntry(
- const rtl::OUString& Path)
+ const OUString& Path)
{
return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
}
@@ -301,9 +301,9 @@ namespace osl
***********************************************/
inline bool searchPath(
- const rtl::OUString& ustrFilePath,
- const rtl::OUString& ustrSearchPathList,
- rtl::OUString& ustrPathFound)
+ const OUString& ustrFilePath,
+ const OUString& ustrSearchPathList,
+ OUString& ustrPathFound)
{
return osl_searchPath(
ustrFilePath.pData,
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 7ba3d90a7037..b25bc3f1ed14 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -99,7 +99,7 @@ namespace
required on network file systems not using unix semantics (AFS, see
fdo#43095).
*/
- void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_access_rights(const OUString& file_path, oslFileStatus* pStat)
{
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -110,7 +110,7 @@ namespace
pStat->uAttributes |= osl_File_Attribute_Executable;
}
- void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
+ void set_file_hidden_status(const OUString& file_path, oslFileStatus* pStat)
{
pStat->uAttributes = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
@@ -119,7 +119,7 @@ namespace
/* the set_file_access_rights must be called after set_file_hidden_status(...) and
set_file_access_mask(...) because of the hack in set_file_access_rights(...) */
void set_file_attributes(
- const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
+ const OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
{
set_file_hidden_status(file_path, pStat);
set_file_access_mask(file_stat, pStat);
@@ -168,9 +168,9 @@ namespace
(field_mask & osl_FileStatus_Mask_Validate));
}
- oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
+ oslFileError set_link_target_url(const OUString& file_path, oslFileStatus* pStat)
{
- rtl::OUString link_target;
+ OUString link_target;
if (!osl::realpath(file_path, link_target))
return oslTranslateFileError(errno);
@@ -183,12 +183,12 @@ namespace
}
oslFileError setup_osl_getFileStatus(
- DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
+ DirectoryItem_Impl * pImpl, oslFileStatus* pStat, OUString& file_path)
{
if ((pImpl == nullptr) || (pStat == nullptr))
return osl_File_E_INVAL;
- file_path = rtl::OUString(pImpl->m_ustrFilePath);
+ file_path = OUString(pImpl->m_ustrFilePath);
OSL_ASSERT(!file_path.isEmpty());
if (file_path.isEmpty())
return osl_File_E_INVAL;
@@ -203,7 +203,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
{
DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
- rtl::OUString file_path;
+ OUString file_path;
oslFileError osl_error = setup_osl_getFileStatus(pImpl, pStat, file_path);
if (osl_error != osl_File_E_None)
return osl_error;
@@ -432,8 +432,8 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
struct stat a_stat, b_stat;
- if (osl::lstat(rtl::OUString(pA->m_ustrFilePath), a_stat) != 0 ||
- osl::lstat(rtl::OUString(pB->m_ustrFilePath), b_stat) != 0)
+ if (osl::lstat(OUString(pA->m_ustrFilePath), a_stat) != 0 ||
+ osl::lstat(OUString(pB->m_ustrFilePath), b_stat) != 0)
return false;
return (a_stat.st_ino == b_stat.st_ino);
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 8e6f30f839d1..24fa04c7bfa6 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -454,7 +454,7 @@ namespace
PATH_MAX else osl_File_E_NAMETOOLONG is the result
*/
- oslFileError osl_getAbsoluteFileURL_impl_(const rtl::OUString& unresolved_path, rtl::OUString& resolved_path)
+ oslFileError osl_getAbsoluteFileURL_impl_(const OUString& unresolved_path, OUString& resolved_path)
{
/* the given unresolved path must not exceed PATH_MAX */
if (unresolved_path.getLength() >= (PATH_MAX - 2))
@@ -569,7 +569,7 @@ namespace
OSL_ASSERT(len < PATH_MAX);
- resolved_path = rtl::OUString(path_resolved_so_far, len);
+ resolved_path = OUString(path_resolved_so_far, len);
return osl_File_E_None;
}
@@ -584,13 +584,13 @@ oslFileError osl_getAbsoluteFileURL(
/* Work around the below call to getSystemPathFromFileURL rejecting input
that starts with "/" (for whatever reason it behaves that way; but
changing that would start to break lots of tests at least) */
- rtl::OUString relUrl(ustrRelativeURL);
+ OUString relUrl(ustrRelativeURL);
if (relUrl.startsWith("//"))
relUrl = "file:" + relUrl;
else if (relUrl.startsWith("/"))
relUrl = "file://" + relUrl;
- rtl::OUString unresolved_path;
+ OUString unresolved_path;
FileBase::RC frc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path);
if (frc != FileBase::E_None)
@@ -598,18 +598,18 @@ oslFileError osl_getAbsoluteFileURL(
if (systemPathIsRelativePath(unresolved_path))
{
- rtl::OUString base_path;
+ OUString base_path;
oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData);
if (rc != osl_File_E_None)
return rc;
- rtl::OUString abs_path;
+ OUString abs_path;
systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
unresolved_path = abs_path;
}
- rtl::OUString resolved_path;
+ OUString resolved_path;
oslFileError rc = osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
if (rc == osl_File_E_None)
{
@@ -627,11 +627,11 @@ namespace detail {
No separate error code if unicode to text conversion or getenv fails because for the
caller there is no difference why a file could not be found in $PATH
*/
- bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
+ bool find_in_PATH(const OUString& file_path, OUString& result)
{
bool bfound = false;
- rtl::OUString path("PATH");
- rtl::OUString env_path;
+ OUString path("PATH");
+ OUString env_path;
if (osl_getEnvironment(path.pData, &env_path.pData) == osl_Process_E_None)
bfound = osl::searchPath(file_path, env_path, result);
@@ -647,23 +647,23 @@ namespace
No separate error code if unicode to text conversion or getcwd fails because for the
caller there is no difference why a file could not be found in CDW
*/
- bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
+ bool find_in_CWD(const OUString& file_path, OUString& result)
{
bool bfound = false;
- rtl::OUString cwd_url;
+ OUString cwd_url;
if (osl_getProcessWorkingDir(&cwd_url.pData) == osl_Process_E_None)
{
- rtl::OUString cwd;
+ OUString cwd;
FileBase::getSystemPathFromFileURL(cwd_url, cwd);
bfound = osl::searchPath(file_path, cwd, result);
}
return bfound;
}
- bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
+ bool find_in_searchPath(const OUString& file_path, rtl_uString* search_path, OUString& result)
{
- return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
+ return (search_path && osl::searchPath(file_path, OUString(search_path), result));
}
}
@@ -673,7 +673,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
FileBase::RC rc;
- rtl::OUString file_path;
+ OUString file_path;
// try to interpret search path as file url else assume it's a system path list
rc = FileBase::getSystemPathFromFileURL(ustrFilePath, file_path);
@@ -683,13 +683,13 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
return oslFileError(rc);
bool bfound = false;
- rtl::OUString result;
+ OUString result;
if (find_in_searchPath(file_path, ustrSearchPath, result) ||
osl::detail::find_in_PATH(file_path, result) ||
find_in_CWD(file_path, result))
{
- rtl::OUString resolved;
+ OUString resolved;
if (osl::realpath(result, resolved))
{
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index c9377040894a..01225e631d82 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -807,8 +807,8 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
void imp_getProcessLocale( rtl_Locale ** ppLocale )
{
- rtl::OUString loc16(macosx_getLocale());
- rtl::OString locale;
+ OUString loc16(macosx_getLocale());
+ OString locale;
if (!loc16.convertToString(
&locale, RTL_TEXTENCODING_UTF8,
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
index 53a132487c82..dce5d65c3df8 100644
--- a/sal/osl/unx/nlsupport.hxx
+++ b/sal/osl/unx/nlsupport.hxx
@@ -29,7 +29,7 @@ namespace rtl { class OUString; }
void imp_getProcessLocale( rtl_Locale ** );
#if defined IOS || defined MACOSX
-rtl::OUString macosx_getLocale();
+OUString macosx_getLocale();
#endif
#endif
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index b1bf89827212..7bd611d85c17 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -62,7 +62,7 @@ namespace
return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);
}
- void append(rtl::OUStringBuffer & buffer, CFStringRef string) {
+ void append(OUStringBuffer & buffer, CFStringRef string) {
CFIndex n = CFStringGetLength(string);
CFStringGetCharacters(
string, CFRangeMake(0, n),
@@ -72,7 +72,7 @@ namespace
/** Grab current locale from system.
*/
-rtl::OUString macosx_getLocale()
+OUString macosx_getLocale()
{
CFStringRef sref = getProcessLocale();
CFStringGuard sGuard(sref);
@@ -84,7 +84,7 @@ rtl::OUString macosx_getLocale()
CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(nullptr, sref, CFSTR("-"));
CFArrayGuard arrGuard(subs);
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
append(buf, static_cast<CFStringRef>(CFArrayGetValueAtIndex(subs, 0)));
// country also available? Assumption: if the array contains more than one
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 480bb264a267..fcb074d9b7c0 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -177,7 +177,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
SAL_WARN("sal.osl", "Failed to change uid and guid: " << UnixErrnoString(errno));
- const rtl::OUString envVar("HOME");
+ const OUString envVar("HOME");
osl_clearEnvironment(envVar.pData);
}
@@ -393,25 +393,25 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
oslFileHandle *pErrorRead
)
{
- rtl::OUString image;
+ OUString image;
if (ustrImageName == nullptr)
{
if (nArguments == 0)
{
return osl_Process_E_InvalidError;
}
- image = rtl::OUString::unacquired(ustrArguments);
+ image = OUString::unacquired(ustrArguments);
}
else
{
osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL(
- rtl::OUString::unacquired(&ustrImageName), image);
+ OUString::unacquired(&ustrImageName), image);
if (e != osl::FileBase::E_None)
{
SAL_INFO(
"sal.osl",
"getSystemPathFromFileURL("
- << rtl::OUString::unacquired(&ustrImageName)
+ << OUString::unacquired(&ustrImageName)
<< ") failed with " << e);
return osl_Process_E_Unknown;
}
@@ -419,7 +419,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
if ((Options & osl_Process_SEARCHPATH) != 0)
{
- rtl::OUString path;
+ OUString path;
if (osl::detail::find_in_PATH(image, path))
{
image = path;
@@ -452,7 +452,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
{
SAL_INFO(
"sal.osl",
- "FileURLToPath(" << rtl::OUString::unacquired(&ustrWorkDir)
+ "FileURLToPath(" << OUString::unacquired(&ustrWorkDir)
<< ") failed with " << e);
return osl_Process_E_Unknown;
}
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index b232695cd57f..2b59e9f3147c 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -224,7 +224,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
/* see @ osl_getExecutableFile(). */
if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), '/') == -1)
{
- const rtl::OUString PATH ("PATH");
+ const OUString PATH ("PATH");
rtl_uString * pSearchPath = nullptr;
osl_getEnvironment (PATH.pData, &pSearchPath);
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9aaa1f29564..ea48309c3b94 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -31,9 +31,9 @@
#include <osl/detail/android-bootstrap.h>
#endif
-static rtl::OString OUStringToOString(const rtl_uString* s)
+static OString OUStringToOString(const rtl_uString* s)
{
- return rtl::OUStringToOString(rtl::OUString(const_cast<rtl_uString*>(s)),
+ return OUStringToOString(OUString(const_cast<rtl_uString*>(s)),
osl_getThreadTextEncoding());
}
@@ -142,16 +142,16 @@ typedef void accessFilePathState;
#ifdef MACOSX
/*
* Helper function for resolving Mac native alias files (not the same as unix alias files)
- * and to return the resolved alias as rtl::OString
+ * and to return the resolved alias as OString
*/
-static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
+static OString macxp_resolveAliasAndConvert(OString const & p)
{
sal_Char path[PATH_MAX];
if (p.getLength() < PATH_MAX)
{
strcpy(path, p.getStr());
macxp_resolveAlias(path, PATH_MAX);
- return rtl::OString(path);
+ return OString(path);
}
return p;
}
@@ -159,7 +159,7 @@ static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const & p)
int access_u(const rtl_uString* pustrPath, int mode)
{
- rtl::OString fn = OUStringToOString(pustrPath);
+ OString fn = OUStringToOString(pustrPath);
#ifdef ANDROID
if (fn == "/assets" || fn.startsWith("/assets/"))
{
@@ -197,7 +197,7 @@ int access_u(const rtl_uString* pustrPath, int mode)
bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
{
- rtl::OString fn = OUStringToOString(pustrFileName);
+ OString fn = OUStringToOString(pustrFileName);
#ifdef ANDROID
if (fn == "/assets" || fn.startsWith("/assets/"))
{
@@ -229,7 +229,7 @@ bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedNa
if (bRet)
{
- rtl::OUString resolved = rtl::OStringToOUString(rtl::OString(static_cast<sal_Char*>(rp)),
+ OUString resolved = OStringToOUString(OString(static_cast<sal_Char*>(rp)),
osl_getThreadTextEncoding());
rtl_uString_assign(ppustrResolvedName, resolved.pData);
@@ -292,7 +292,7 @@ int lstat_c(const char* cpPath, struct stat* buf)
int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
{
- rtl::OString fn = OUStringToOString(pustrPath);
+ OString fn = OUStringToOString(pustrPath);
#ifdef MACOSX
fn = macxp_resolveAliasAndConvert(fn);
@@ -303,7 +303,7 @@ int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
int mkdir_u(const rtl_uString* path, mode_t mode)
{
- rtl::OString fn = OUStringToOString(path);
+ OString fn = OUStringToOString(path);
accessFilePathState *state = prepare_to_access_file_path(fn.getStr());
@@ -388,7 +388,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path)
* abstraction layer that keeps the pathname around.
*/
- rtl::OString fn = rtl::OString(path);
+ OString fn = OString(path);
#ifdef MACOSX
fn = macxp_resolveAliasAndConvert(fn);
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 4be4fbb28748..5030b75ca214 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -60,7 +60,7 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
namespace osl
{
- inline int access(const rtl::OUString& ustrPath, int mode)
+ inline int access(const OUString& ustrPath, int mode)
{
return access_u(ustrPath.pData, mode);
}
@@ -79,18 +79,18 @@ namespace osl
**********************************/
inline bool realpath(
- const rtl::OUString& ustrFileName,
- rtl::OUString& ustrResolvedName)
+ const OUString& ustrFileName,
+ OUString& ustrResolvedName)
{
return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
}
- inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
+ inline int lstat(const OUString& ustrPath, struct stat& buf)
{
return lstat_u(ustrPath.pData, &buf);
}
- inline int mkdir(const rtl::OUString& aPath, mode_t aMode)
+ inline int mkdir(const OUString& aPath, mode_t aMode)
{
return mkdir_u(aPath.pData, aMode);
}
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 5e630c95a5ee..b8f8ad4e261f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -179,7 +179,7 @@ namespace
return has_parent;
}
- inline bool has_path_parent(const rtl::OUString& path)
+ inline bool has_path_parent(const OUString& path)
{ return has_path_parent(path.getStr()); }
}
@@ -589,7 +589,7 @@ static DWORD create_dir_with_callback(
{
if (aDirectoryCreationCallbackFunc)
{
- rtl::OUString url;
+ OUString url;
osl_getFileURLFromSystemPath(dir_path, &(url.pData));
aDirectoryCreationCallbackFunc(pData, url.pData);
}
@@ -654,7 +654,7 @@ oslFileError SAL_CALL osl_createDirectoryPath(
if (aDirectoryUrl == nullptr)
return osl_File_E_INVAL;
- rtl::OUString sys_path;
+ OUString sys_path;
oslFileError osl_error =
osl_getSystemPathFromFileURL_(aDirectoryUrl, &sys_path.pData, false);
@@ -1149,14 +1149,14 @@ static inline bool is_floppy_A_present()
static inline bool is_floppy_B_present()
{ return (GetLogicalDrives() & 2); }
-static bool is_floppy_volume_mount_point(const rtl::OUString& path)
+static bool is_floppy_volume_mount_point(const OUString& path)
{
// determines if a volume mount point shows to a floppy
// disk by comparing the unique volume names
static const LPCWSTR FLOPPY_A = L"A:\\";
static const LPCWSTR FLOPPY_B = L"B:\\";
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathEnsureSeparator(p);
WCHAR vn[51];
@@ -1176,7 +1176,7 @@ static bool is_floppy_volume_mount_point(const rtl::OUString& path)
return false;
}
-static bool is_floppy_drive(const rtl::OUString& path)
+static bool is_floppy_drive(const OUString& path)
{
static const LPCWSTR FLOPPY_DRV_LETTERS = L"AaBb";
@@ -1190,9 +1190,9 @@ static bool is_floppy_drive(const rtl::OUString& path)
return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
}
-static bool is_volume_mount_point(const rtl::OUString& path)
+static bool is_volume_mount_point(const OUString& path)
{
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathRemoveSeparator(p);
bool is_volume_root = false;
@@ -1220,12 +1220,12 @@ static bool is_volume_mount_point(const rtl::OUString& path)
return is_volume_root;
}
-static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
+static UINT get_volume_mount_point_drive_type(const OUString& path)
{
if (0 == path.getLength())
return GetDriveTypeW(nullptr);
- rtl::OUString p(path);
+ OUString p(path);
osl::systemPathEnsureSeparator(p);
WCHAR vn[51];
@@ -1241,7 +1241,7 @@ static inline bool is_drivetype_request(sal_uInt32 field_mask)
}
static oslFileError osl_get_drive_type(
- const rtl::OUString& path, oslVolumeInfo* pInfo)
+ const OUString& path, oslVolumeInfo* pInfo)
{
// GetDriveType fails on empty volume mount points
// see Knowledge Base Q244089
@@ -1295,7 +1295,7 @@ static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
}
static void get_volume_space_information(
- const rtl::OUString& path, oslVolumeInfo *pInfo)
+ const OUString& path, oslVolumeInfo *pInfo)
{
BOOL ret = GetDiskFreeSpaceExW(
o3tl::toW(path.getStr()),
@@ -1322,7 +1322,7 @@ static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
}
static oslFileError get_filesystem_attributes(
- const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
+ const OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
{
pInfo->uAttributes = 0;
@@ -1374,7 +1374,7 @@ static oslFileError get_filesystem_attributes(
return osl_File_E_None;
}
-static bool path_get_parent(rtl::OUString& path)
+static bool path_get_parent(OUString& path)
{
OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
@@ -1383,16 +1383,16 @@ static bool path_get_parent(rtl::OUString& path)
sal_Int32 i = path.lastIndexOf(BACKSLASH);
if (-1 < i)
{
- path = rtl::OUString(path.getStr(), i);
+ path = OUString(path.getStr(), i);
return true;
}
}
return false;
}
-static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
+static void path_travel_to_volume_root(const OUString& system_path, OUString& volume_root)
{
- rtl::OUString sys_path(system_path);
+ OUString sys_path(system_path);
while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
/**/;
@@ -1407,13 +1407,13 @@ oslFileError SAL_CALL osl_getVolumeInformation(
if (!pInfo)
return osl_File_E_INVAL;
- rtl::OUString system_path;
+ OUString system_path;
oslFileError error = osl_getSystemPathFromFileURL_(ustrURL, &system_path.pData, false);
if (osl_File_E_None != error)
return error;
- rtl::OUString volume_root;
+ OUString volume_root;
path_travel_to_volume_root(system_path, volume_root);
pInfo->uValidFields = 0;
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 82260c85ef07..f34b437fefd2 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -637,7 +637,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
strUTF8->length != strURL->length &&
0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
, "sal.osl"
- ,"osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not encoded !!!");
+ ,"osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not encoded !!!");
bValidEncoded = osl_decodeURL_( strUTF8, &strDecodedURL );
@@ -734,7 +734,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
}
else
SAL_INFO_IF(nError, "sal.osl",
- "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not an absolute FileURL");
+ "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not an absolute FileURL");
}
@@ -748,7 +748,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
rtl_uString_release( strTempPath );
SAL_INFO_IF(nError, "sal.osl",
- "osl_getSystemPathFromFileURL: \"" << rtl::OUString(strURL) << "\" is not a FileURL");
+ "osl_getSystemPathFromFileURL: \"" << OUString(strURL) << "\" is not a FileURL");
return nError;
}
@@ -854,7 +854,7 @@ oslFileError osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** p
rtl_uString_release( strTempURL );
SAL_INFO_IF(nError, "sal.osl",
- "osl_getFileURLFromSystemPath: \"" << rtl::OUString(strPath) << "\" is not a systemPath");
+ "osl_getFileURLFromSystemPath: \"" << OUString(strPath) << "\" is not a systemPath");
return nError;
}
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 900888bd1544..abbc46f165d8 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -25,15 +25,15 @@
#include <algorithm>
#include <wchar.h>
-const rtl::OUString BACKSLASH ("\\");
-const rtl::OUString SLASH ("/");
+const OUString BACKSLASH ("\\");
+const OUString SLASH ("/");
void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
{
OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath),
"osl_systemPathEnsureSeparator: Invalid parameter");
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
if (i < (path.getLength()-1))
@@ -49,7 +49,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
{
- rtl::OUString path(*ppustrPath);
+ OUString path(*ppustrPath);
if (!osl::systemPathIsLogicalDrivePattern(path))
{
@@ -57,7 +57,7 @@ void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
if (i > -1 && (i == (path.getLength() - 1)))
{
- path = rtl::OUString(path.getStr(), path.getLength() - 1);
+ path = OUString(path.getStr(), path.getLength() - 1);
rtl_uString_assign(ppustrPath, path.pData);
}
}
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 237c130f7fd8..bcb4f83af701 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -61,7 +61,7 @@ namespace osl
drive alone
*/
-inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathEnsureSeparator(/*inout*/ OUString& Path)
{
osl_systemPathEnsureSeparator(&Path.pData);
}
@@ -71,12 +71,12 @@ inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
if the path is not the root path '\'
*/
-inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
+inline void systemPathRemoveSeparator(/*inout*/ OUString& Path)
{
osl_systemPathRemoveSeparator(&Path.pData);
}
-inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
+inline bool systemPathIsLogicalDrivePattern(/*in*/ const OUString& path)
{
return osl_systemPathIsLogicalDrivePattern(path.pData);
}
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index a2e4021f0f1f..d9cbaaa19617 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -45,7 +45,7 @@ namespace /* private */
second one. */
struct less_environment_variable
{
- bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const
+ bool operator() (const OUString& lhs, const OUString& rhs) const
{
OSL_ENSURE((lhs.indexOf(L'=') > -1) &&
(rhs.indexOf(L'=') > -1),
@@ -70,7 +70,7 @@ namespace /* private */
sum_of_string_lengths() : sum_(0) {}
- void operator() (const rtl::OUString& string)
+ void operator() (const OUString& string)
{
OSL_ASSERT(string.getLength());
@@ -128,7 +128,7 @@ namespace /* private */
for (sal_uInt32 i = 0; i < env_vars_count; i++)
{
- rtl::OUString env_var = rtl::OUString(env_vars[i]);
+ OUString env_var = OUString(env_vars[i]);
if (env_var.getLength() == 0)
return false;
@@ -236,9 +236,9 @@ namespace /* private */
// Add a quote sign to the start and the end of a string
// if not already present
- rtl::OUString quote_string(const rtl::OUString& string)
+ OUString quote_string(const OUString& string)
{
- rtl::OUStringBuffer quoted;
+ OUStringBuffer quoted;
if (string.indexOf(L'"') != 0)
quoted.append('"');
@@ -256,9 +256,9 @@ namespace /* private */
// may not have the file extension ".exe". However, if the file on disk has the
// ".exe" extension, then the function will fail. In this case a second attempt
// is started by adding the parameter "extension" to "path".
- rtl::OUString getShortPath(rtl::OUString const & path, rtl::OUString const & extension)
+ OUString getShortPath(OUString const & path, OUString const & extension)
{
- rtl::OUString ret(path);
+ OUString ret(path);
if (path.getLength() > 260)
{
std::vector<sal_Unicode> vec(path.getLength() + 1);
@@ -269,16 +269,16 @@ namespace /* private */
if (!len && GetLastError() == ERROR_FILE_NOT_FOUND
&& extension.getLength())
{
- const rtl::OUString extPath(path + extension);
+ const OUString extPath(path + extension);
std::vector<sal_Unicode> vec2(
extPath.getLength() + 1);
const DWORD len2 = GetShortPathNameW(
o3tl::toW(extPath.getStr()), o3tl::toW(&vec2[0]), extPath.getLength() + 1);
- ret = rtl::OUString(&vec2[0], len2);
+ ret = OUString(&vec2[0], len2);
}
else
{
- ret = rtl::OUString(&vec[0], len);
+ ret = OUString(&vec[0], len);
}
}
return ret;
@@ -288,26 +288,26 @@ namespace /* private */
// be provided via the strImageName parameter or as first
// element of the strArguments list.
// The returned path will be quoted if it contains spaces.
- rtl::OUString get_executable_path(
+ OUString get_executable_path(
rtl_uString* image_name,
rtl_uString* cmdline_args[],
sal_uInt32 n_cmdline_args,
bool search_path)
{
- rtl::OUString exe_name;
+ OUString exe_name;
if (image_name)
exe_name = image_name;
else if (n_cmdline_args)
- exe_name = rtl::OUString(cmdline_args[0]);
+ exe_name = OUString(cmdline_args[0]);
- rtl::OUString exe_url = exe_name;
+ OUString exe_url = exe_name;
if (search_path)
osl_searchFileURL(exe_name.pData, nullptr, &exe_url.pData);
- rtl::OUString exe_path;
+ OUString exe_path;
if (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(exe_url, exe_path))
- return rtl::OUString();
+ return OUString();
exe_path = getShortPath(exe_path, ".exe");
@@ -317,27 +317,27 @@ namespace /* private */
return exe_path;
}
- rtl::OUString get_file_extension(const rtl::OUString& file_name)
+ OUString get_file_extension(const OUString& file_name)
{
sal_Int32 index = file_name.lastIndexOf('.');
if ((index != -1) && ((index + 1) < file_name.getLength()))
return file_name.copy(index + 1);
- return rtl::OUString();
+ return OUString();
}
- bool is_batch_file(const rtl::OUString& file_name)
+ bool is_batch_file(const OUString& file_name)
{
- rtl::OUString ext = get_file_extension(file_name);
+ OUString ext = get_file_extension(file_name);
return (ext.equalsIgnoreAsciiCase("bat") ||
ext.equalsIgnoreAsciiCase("cmd") ||
ext.equalsIgnoreAsciiCase("btm"));
}
- const rtl::OUString ENV_COMSPEC ("COMSPEC");
- rtl::OUString get_batch_processor()
+ const OUString ENV_COMSPEC ("COMSPEC");
+ OUString get_batch_processor()
{
- rtl::OUString comspec;
+ OUString comspec;
osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData);
OSL_ASSERT(comspec.getLength());
@@ -390,7 +390,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
oslFileHandle *pProcessOutputRead,
oslFileHandle *pProcessErrorRead)
{
- rtl::OUString exe_path = get_executable_path(
+ OUString exe_path = get_executable_path(
ustrImageName, ustrArguments, nArguments, (Options & osl_Process_SEARCHPATH) != 0);
if (0 == exe_path.getLength())
@@ -400,11 +400,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
return osl_Process_E_InvalidError;
DWORD flags = NORMAL_PRIORITY_CLASS;
- rtl::OUStringBuffer command_line;
+ OUStringBuffer command_line;
if (is_batch_file(exe_path))
{
- rtl::OUString batch_processor = get_batch_processor();
+ OUString batch_processor = get_batch_processor();
if (batch_processor.getLength())
{
@@ -430,7 +430,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
command_line.append(" ");
/* Quote arguments containing blanks */
- if (rtl::OUString(ustrArguments[n]).indexOf(' ') != -1)
+ if (OUString(ustrArguments[n]).indexOf(' ') != -1)
command_line.append(quote_string(ustrArguments[n]));
else
command_line.append(ustrArguments[n]);
@@ -449,7 +449,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
p_environment = &environment[0];
}
- rtl::OUString cwd;
+ OUString cwd;
if (ustrDirectory && ustrDirectory->length && (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd)))
return osl_Process_E_InvalidError;
@@ -510,7 +510,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
startup_info.wShowWindow = SW_NORMAL;
}
- rtl::OUString cmdline = command_line.makeStringAndClear();
+ OUString cmdline = command_line.makeStringAndClear();
PROCESS_INFORMATION process_info;
BOOL bRet = FALSE;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-25 09:35:30 +0000