diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:08:24 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:08:24 +0100 |
| commit | 05745bb195bd54933dbc2333fde1b147f894c0ea (patch) | |
| tree | 418a5a4b9b6c5e7549a580d657389c00037f860b /unoxml | |
| parent | 48b7ae25d490230ecb4cad6545d40098b81d7992 (diff) | |
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 10 | ||||
| -rw-r--r-- | unoxml/source/dom/elementlist.cxx | 2 | ||||
| -rw-r--r-- | unoxml/source/xpath/xpathapi.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index b65fffc632da..c1cefe1efc9c 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -94,7 +94,7 @@ namespace DOM is.aInputStream = aContent.openStream(); } catch (com::sun::star::uno::Exception) { - OSL_ENSURE(sal_False, "exception in default entity resolver"); + OSL_FAIL("exception in default entity resolver"); is.aInputStream = Reference< XInputStream >(); } return is; @@ -228,7 +228,7 @@ namespace DOM return nread; } catch (com::sun::star::uno::Exception& ex) { (void) ex; - OSL_ENSURE(sal_False, OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); return -1; } } @@ -248,7 +248,7 @@ namespace DOM return 0; } catch (com::sun::star::uno::Exception& ex) { (void) ex; - OSL_ENSURE(sal_False, OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); return -1; } } @@ -300,7 +300,7 @@ namespace DOM OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 warning\n"))); buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx))); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } // default error handler triggers assertion @@ -309,7 +309,7 @@ namespace DOM OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error\n"))); buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx))); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } } // extern "C" diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 5b0d96758459..f458b1928d23 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -72,7 +72,7 @@ namespace DOM } catch (Exception &e){ OString aMsg("Exception caught while registering NodeList as listener:\n"); aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMsg.getStr()); + OSL_FAIL(aMsg.getStr()); } } diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index a800cefc5f52..ee729a9451e3 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -283,7 +283,7 @@ namespace XPath buf.appendAscii(str); OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } static void structured_error_func(void * userData, xmlErrorPtr error) @@ -298,7 +298,7 @@ namespace XPath } OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, msg.getStr()); + OSL_FAIL(msg.getStr()); } } // extern "C" |