[Libreoffice-commits] .: jvmfwk/source sal/osl

[Thomas Arnhold]

 jvmfwk/source/elements.cxx |    6 +++---
 sal/osl/w32/file_url.cxx   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f4728c25f96efa930c52b3f95a1e2d202d28093b
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Feb 26 10:32:31 2011 +0100

    Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 078d5a6..20aaa4d 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -253,7 +253,7 @@ void NodeJava::load()
     }
     else
     {
-        OSL_ASSERT("[Java framework] Unknown enum used.");
+        OSL_FAIL("[Java framework] Unknown enum used.");
     }
         
 
@@ -381,7 +381,7 @@ void NodeJava::load()
     case INSTALL: ret = getInstallSettingsPath(); break;
     case SHARED: ret = getSharedSettingsPath(); break;
     default:
-        OSL_ASSERT("[Java framework] NodeJava::getSettingsPath()");
+        OSL_FAIL("[Java framework] NodeJava::getSettingsPath()");
     }
     return ret;
 }
@@ -395,7 +395,7 @@ void NodeJava::load()
     case INSTALL: ret = BootParams::getInstallData(); break;
     case SHARED: ret = BootParams::getSharedData(); break;
     default:
-        OSL_ASSERT("[Java framework] NodeJava::getSettingsURL()");
+        OSL_FAIL("[Java framework] NodeJava::getSettingsURL()");
     }
     return ret;
 }
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index f045705..cf4e2ec 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -898,7 +898,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
                     break;
 
                 default:
-                    OSL_ASSERT( "Unexpected long path format!" );
+                    OSL_FAIL( "Unexpected long path format!" );
                     rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
                     break;
             }