Its the same logic
On Sun, Jun 5, 2011 at 6:44 AM, Chr. Rossmanith <ChrRossmanith@gmx.de>wrote:
Hi,
could someone please double check that the new if statement is equivalent
to the old one...
sal/osl/unx/file_url.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index a005cc8..858a7d7 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -762,7 +762,7 @@ oslFileError osl_searchFileURL(rtl_uString*
ustrFilePath, rtl_uString* ustrSearc
// try to interpret search path as file url else assume it's a system
path list
rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath),
file_path);
- if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
+ if (FileBase::E_INVAL == rc)
file_path = ustrFilePath;
else if (FileBase::E_None != rc)
return oslFileError(rc);
I'll push it if it's ok.
Christina
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.