diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:51:35 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-13 16:54:59 +0100 |
| commit | 64378f446e782b6636312a8c72a7400fd799c1a4 (patch) | |
| tree | 25376336ad586c3804f16ebc05d62fb069bce74b /sw/source/ui/envelp | |
| parent | 83d8300b31948702f3c11dc14d4070501b108084 (diff) | |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labelcfg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 522f5cdf0bfa..ae28dbb70552 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -329,7 +329,7 @@ bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const case MID_ENV_SHIFT_RIGHT : rVal <<= lShiftRight; break; case MID_ENV_SHIFT_DOWN : rVal <<= lShiftDown; break; default: - OSL_ENSURE(false, "Wrong memberId"); + OSL_FAIL("Wrong memberId"); bRet = false; } return bRet; @@ -361,7 +361,7 @@ bool SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId) case MID_ENV_SHIFT_RIGHT : bRet = (rVal >>= lShiftRight); break; case MID_ENV_SHIFT_DOWN : bRet = (rVal >>= lShiftDown); break; default: - OSL_ENSURE(false,"Wrong memberId"); + OSL_FAIL("Wrong memberId"); } return bRet; } diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index ba7df1fcd812..45ceda1bf36c 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -229,7 +229,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, { if(!AddNode(OUString(), rManufacturer)) { - OSL_ENSURE(false, "New configuration node could not be created"); + OSL_FAIL("New configuration node could not be created"); return ; } else diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 9d7f80ba2ee8..735d86b7596f 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -143,7 +143,7 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (Runtime void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeException) { - OSL_ENSURE(false, "disposing"); + OSL_FAIL("disposing"); } SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, |