diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-16 09:49:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-16 09:49:11 +0000 |
| commit | a53b9bb3faa8aa52969b695a3198be5e92ddd6e2 (patch) | |
| tree | 728ec10d38a11afd478832227c8445e11ce2abca /tools/source/misc | |
| parent | Remove large block of unused code (diff) | |
| download | core-a53b9bb3faa8aa52969b695a3198be5e92ddd6e2.tar.gz core-a53b9bb3faa8aa52969b695a3198be5e92ddd6e2.zip | |
tidy tools::getProcessWorkingDir
Diffstat (limited to 'tools/source/misc')
| -rw-r--r-- | tools/source/misc/getprocessworkingdir.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx index f4dd1f39aec6..a64e882e33f6 100644 --- a/tools/source/misc/getprocessworkingdir.cxx +++ b/tools/source/misc/getprocessworkingdir.cxx @@ -41,24 +41,27 @@ namespace tools { -bool getProcessWorkingDir(rtl::OUString * url) { - OSL_ASSERT(url != NULL); +bool getProcessWorkingDir(rtl::OUString &rUrl) +{ + rUrl = rtl::OUString(); rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("$OOO_CWD")); rtl::Bootstrap::expandMacros(s); - if (s.getLength() == 0) { - if (osl_getProcessWorkingDir(&url->pData) == osl_Process_E_None) { + if (s.getLength() == 0) + { + if (osl_getProcessWorkingDir(&rUrl.pData) == osl_Process_E_None) return true; - } - } else if (s[0] == '1') { - *url = s.copy(1); + } + else if (s[0] == '1') + { + rUrl = s.copy(1); return true; - } else if (s[0] == '2' && - (osl::FileBase::getFileURLFromSystemPath(s.copy(1), *url) == + } + else if (s[0] == '2' && + (osl::FileBase::getFileURLFromSystemPath(s.copy(1), rUrl) == osl::FileBase::E_None)) { return true; } - *url = rtl::OUString(); return false; } |