[Libreoffice] [PATCH 1/3] Simplified if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
Chr. Rossmanith
ChrRossmanith at gmx.de
Sun Jun 5 04:14:50 PDT 2011
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
More information about the LibreOffice
mailing list