mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jl145: #106849# assertion because osl_getAbsoluteFileUrl is called with file URL instead of a path as argument.

Browse Source
This commit is contained in:
Joachim Lingner
2009-12-02 12:27:30 +01:00
parent 8fd3f31eb9
commit c6826a3905
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jvmfwk/plugins/sunmajor/pluginlib/util.cxx
View File

@@ -788,18 +788,15 @@ bool getJREInfoByPath(const rtl::OUString& path,
/** Checks if the path is a directory. Links are resolved.
In case of an error the returned string has the length 0.
Otherwise the returned string is the "resolved" file URL.
*/
OUString resolveDirPath(const OUString & path)
OUString resolveDirPath(const OUString & dirUrl)
{
OUString ret;
OUString sResolved;
if (File::getAbsoluteFileURL(
rtl::OUString(), path, sResolved) != File::E_None)
return OUString();
OUString ret;
//check if this is a valid path and if it is a directory
DirectoryItem item;
if (DirectoryItem::get(sResolved, item) == File::E_None)
if (DirectoryItem::get(dirUrl, item) == File::E_None)
{
FileStatus status(FileStatusMask_Type |
FileStatusMask_LinkTargetURL |
@@ -808,7 +805,7 @@ OUString resolveDirPath(const OUString & path)
if (item.getFileStatus(status) == File::E_None
&& status.getFileType() == FileStatus::Directory)
{
ret = sResolved;
ret = dirUrl;
}
}
else