Its the same logic<br><br><div class="gmail_quote">On Sun, Jun 5, 2011 at 6:44 AM, Chr. Rossmanith <span dir="ltr"><<a href="mailto:ChrRossmanith@gmx.de">ChrRossmanith@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi,<br>
<br>
could someone please double check that the new if statement is equivalent to the old one...<br>
<br>
sal/osl/unx/file_url.cxx | 2 +-<br>
1 files changed, 1 insertions(+), 1 deletions(-)<br>
<br>
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx<br>
index a005cc8..858a7d7 100644<br>
--- a/sal/osl/unx/file_url.cxx<br>
+++ b/sal/osl/unx/file_url.cxx<br>
@@ -762,7 +762,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc<br>
<br>
// try to interpret search path as file url else assume it's a system path list<br>
rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);<br>
- if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))<br>
+ if (FileBase::E_INVAL == rc)<br>
file_path = ustrFilePath;<br>
else if (FileBase::E_None != rc)<br>
return oslFileError(rc);<br>
<br>
<br>
I'll push it if it's ok.<br>
<br>
Christina<br>
_______________________________________________<br>
LibreOffice mailing list<br>
<a href="mailto:LibreOffice@lists.freedesktop.org" target="_blank">LibreOffice@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/libreoffice" target="_blank">http://lists.freedesktop.org/mailman/listinfo/libreoffice</a><br>
</blockquote></div><br>