diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:06:18 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:06:18 +0100 |
commit | 352f1a58e24c9c3ec45829111a77fa9fbd8065ab (patch) | |
tree | f4d3ec761af697a535fad86c5fec2e045c933d0e /cui/source | |
parent | 00d5ba291e359368ee484a7c0c43281c22bd3df6 (diff) |
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/multifil.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/connpooloptions.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/sdbcdriverenum.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index bdae49e60979..cc76430f7da0 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -121,7 +121,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) } // end of try(} catch( const Exception& ) // catch every exception of comparison { - OSL_ENSURE( sal_False, "AddHdl_Impl: caught an unexpected exception!" ); + OSL_FAIL( "AddHdl_Impl: caught an unexpected exception!" ); } if ( bDuplicated ) // #97807# -------------------- diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 988d8574c75a..158652898b43 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -237,7 +237,7 @@ namespace offapp sReturn = String::CreateFromInt32(_rPos->nTimeoutSeconds); break; default: - OSL_ENSURE(sal_False, "DriverListControl::implGetCellText: invalid column id!"); + OSL_FAIL("DriverListControl::implGetCellText: invalid column id!"); } return sReturn; } @@ -256,7 +256,7 @@ namespace offapp String sReturn; if (nRow > m_aSettings.size()) { - OSL_ENSURE(sal_False, "DriverListControl::GetCellText: don't ask me for such rows!"); + OSL_FAIL("DriverListControl::GetCellText: don't ask me for such rows!"); } else { @@ -376,7 +376,7 @@ namespace offapp m_pDriverList->Update(pDriverSettings->getSettings()); else { - OSL_ENSURE(sal_False, "ConnectionPoolOptionsPage::implInitControls: missing the DriverTimeouts item!"); + OSL_FAIL("ConnectionPoolOptionsPage::implInitControls: missing the DriverTimeouts item!"); m_pDriverList->Update(DriverPoolingSettings()); } m_pDriverList->saveValue(); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 28d426e6e79b..03f35d6d1111 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1344,7 +1344,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe // we'll just leave the box in it's default setting and won't // even give it event handler... OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMsg.getStr()); + OSL_FAIL(aMsg.getStr()); } aWesternLanguageLB.SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True ); @@ -1500,7 +1500,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW ); if ( !m_sUserLocaleValue.equals(aLangString)) { - // OSL_ENSURE(sal_False, "UserInterface language was changed, restart."); + // OSL_FAIL("UserInterface language was changed, restart."); // write new value xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); @@ -1527,7 +1527,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // we'll just leave the box in it's default setting and won't // even give it event handler... OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMsg.getStr()); + OSL_FAIL(aMsg.getStr()); } OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index a3a30c1e13db..45119573c5da 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -799,7 +799,7 @@ void SvxPathTabPage::GetPathList( } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SvxPathTabPage::GetPathList(): caught an exception!" ); + OSL_FAIL( "SvxPathTabPage::GetPathList(): caught an exception!" ); } } @@ -844,7 +844,7 @@ void SvxPathTabPage::SetPathList( } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SvxPathTabPage::SetPathList(): caught an exception!" ); + OSL_FAIL( "SvxPathTabPage::SetPathList(): caught an exception!" ); } } diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 86e4ec494426..98b7bced375a 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -84,7 +84,7 @@ namespace offapp } catch(const Exception&) { - OSL_ENSURE(sal_False, "ODriverEnumerationImpl::ODriverEnumerationImpl: caught an exception while enumerating the drivers!"); + OSL_FAIL("ODriverEnumerationImpl::ODriverEnumerationImpl: caught an exception while enumerating the drivers!"); } } |