diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:49:53 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:48 +0100 |
| commit | 6488e5f1207eb3f72e00cd1e2ada2e443c891373 (patch) | |
| tree | 4e4424bf1aa525f86cf48ff5a0c1044cab0efaff /cppuhelper | |
| parent | 7769f9dbd4613a147a60d76e2df9fedd0f11289f (diff) | |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/implbase.cxx | 8 | ||||
| -rw-r--r-- | cppuhelper/source/propshlp.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/weak.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 60f153194bef..3f0e238762f6 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -254,8 +254,8 @@ void WeakComponentImplHelperBase::release() dispose(); } catch (RuntimeException const& exc) { // don't break throw () - OSL_ENSURE( - false, OUStringToOString( + OSL_FAIL( + OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } @@ -390,8 +390,8 @@ void WeakAggComponentImplHelperBase::release() dispose(); } catch (RuntimeException const& exc) { // don't break throw () - OSL_ENSURE( - false, OUStringToOString( + OSL_FAIL( + OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 9abc35dd3632..0cc3e14f2133 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -1016,7 +1016,7 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () ) { #ifndef OS2 // YD disabled, too many troubles with debug builds! if (bSorted) { - OSL_ENSURE( false, "Property array is not sorted" ); + OSL_FAIL( "Property array is not sorted" ); } #endif // not sorted diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 1dd76d26758e..11b99fc45076 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -226,8 +226,8 @@ void OWeakObject::disposeWeakConnectionPoint() p->dispose(); } catch (RuntimeException const& exc) { - OSL_ENSURE( - false, OUStringToOString( + OSL_FAIL( + OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } |