diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:31:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:31:11 +0000 |
| commit | b09b8deba3b434b4a68ad7c5b94055477d23f9a4 (patch) | |
| tree | 275535e18a2edea39dcae7b0f50518b547f129ab /testshl2 | |
| parent | 11a03a221adcaa12e4ff57c2c7e7d8a7467c2068 (diff) | |
INTEGRATION: CWS ause093 (1.10.6); FILE MERGED
2008/05/06 06:41:57 lla 1.10.6.1: #i88845# cleanups
Diffstat (limited to 'testshl2')
| -rw-r--r-- | testshl2/source/filehelper.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/testshl2/source/filehelper.cxx b/testshl2/source/filehelper.cxx index 63ffdc51fb34..c29259a12d4a 100644 --- a/testshl2/source/filehelper.cxx +++ b/testshl2/source/filehelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filehelper.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -91,7 +91,7 @@ std::string getTempPath() rtl::OUString convertPath( rtl::OUString const& _suSysPath ) { // PRE: String should contain a filename, relativ or absolut - rtl::OUString fURL; + rtl::OUString suURL; bool bRelativ = false; #ifdef WNT sal_Char cFileSep[] = "\\"; @@ -115,13 +115,20 @@ rtl::OUString convertPath( rtl::OUString const& _suSysPath ) // filepath contains '..' so it's a relative path make it absolut. rtl::OUString curDirPth; osl_getProcessWorkingDir( &curDirPth.pData ); - osl::FileBase::getAbsoluteFileURL( curDirPth, _suSysPath, fURL ); + + // rtl::OString sCurDirPath = rtl::OUStringToOString(curDirPth, RTL_TEXTENCODING_ASCII_US); + // fprintf(stderr, "Current Dir '%s'.\n", sCurDirPath.getStr()); + + osl::FileBase::getAbsoluteFileURL( curDirPth, _suSysPath, suURL ); + + // rtl::OString sURL = rtl::OUStringToOString(suURL, RTL_TEXTENCODING_ASCII_US); + // fprintf(stderr, " File URL: '%s'.\n", sURL.getStr()); } else { - osl::FileBase::getFileURLFromSystemPath( _suSysPath, fURL ); + osl::FileBase::getFileURLFromSystemPath( _suSysPath, suURL ); } - return fURL; + return suURL; } // ----------------------------------------------------------------------------- rtl::OUString convertPath( rtl::OString const& sysPth ) |