[Libreoffice-commits] core.git: sal/osl

Tor Lillqvist tml at collabora.com
Sun Mar 29 13:04:02 PDT 2015


 sal/osl/unx/file_url.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit da1d01a432e160031abbf445b4efe879a664bbfa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Mar 29 10:12:37 2015 +0300

    Minor simplification
    
    Change-Id: Idcf9158d0446107ec783fd8691078791d7b25e31

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 30c03ba..742b3f5 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -697,11 +697,8 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
 
         if (osl::realpath(result, resolved))
         {
-#if OSL_DEBUG_LEVEL > 0
-            oslFileError osl_error =
-#endif
-                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);
-            OSL_ASSERT(osl_File_E_None == osl_error);
+            oslFileError osl_error = osl_getFileURLFromSystemPath(resolved.pData, pustrURL);
+            SAL_WARN_IF(osl_File_E_None != osl_error, "sal.file", "osl_getFileURLFromSystemPath failed");
             bfound = true;
         }
     }


More information about the Libreoffice-commits mailing list