summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2009-12-02 12:27:30 +0100
committerJoachim Lingner <jl@openoffice.org>2009-12-02 12:27:30 +0100
commitc6826a3905f0d51bc4719d998d6031981bfd09a1 (patch)
tree723389976a9e56a65233a4bcbe2381ca5d03840a /jvmfwk
parent8fd3f31eb907c32d01f16e5d87ed0ed203db8e6e (diff)
jl145: #106849# assertion because osl_getAbsoluteFileUrl is called with file URL instead of a path as argument.
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index a823d551af88..3a1dc0e05c28 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -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