Kaydet (Commit) 514ccf73 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1408971 Mixing enum types

Change-Id: I30c46f2bd8a0ae059722f60a3103e5c7883d6a2d
Reviewed-on: https://gerrit.libreoffice.org/37630Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 2fbcdd3e
...@@ -590,21 +590,18 @@ oslFileError osl_getAbsoluteFileURL( ...@@ -590,21 +590,18 @@ oslFileError osl_getAbsoluteFileURL(
else if (relUrl.startsWith("/")) else if (relUrl.startsWith("/"))
relUrl = "file://" + relUrl; relUrl = "file://" + relUrl;
FileBase::RC rc;
rtl::OUString unresolved_path; rtl::OUString unresolved_path;
rc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path); FileBase::RC frc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path);
if (frc != FileBase::E_None)
if (rc != FileBase::E_None) return oslFileError(frc);
return oslFileError(rc);
if (systemPathIsRelativePath(unresolved_path)) if (systemPathIsRelativePath(unresolved_path))
{ {
rtl::OUString base_path; rtl::OUString base_path;
rc = (FileBase::RC) osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData); oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData);
if (rc != osl_File_E_None)
if (rc != FileBase::E_None) return rc;
return oslFileError(rc);
rtl::OUString abs_path; rtl::OUString abs_path;
systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path); systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
...@@ -613,14 +610,14 @@ oslFileError osl_getAbsoluteFileURL( ...@@ -613,14 +610,14 @@ oslFileError osl_getAbsoluteFileURL(
} }
rtl::OUString resolved_path; rtl::OUString resolved_path;
rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path); oslFileError rc = osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
if (rc == FileBase::E_None) if (rc == osl_File_E_None)
{ {
rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL); rc = osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);
OSL_ASSERT(FileBase::E_None == rc); OSL_ASSERT(osl_File_E_None == rc);
} }
return oslFileError(rc); return rc;
} }
namespace osl { namespace osl {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment