diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-24 12:55:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-24 13:41:20 +0100 |
| commit | a1022694d8a116efe6f7835f5b10b3396bf5b40f (patch) | |
| tree | 549bf1223e23196dfc5d7dc97ab762095342e060 /svl | |
| parent | bcbbe579f457816c412ebf9e003a172b2f0991af (diff) | |
svl: convert DBG_ASSERTs in SvtCJKOptions
Change-Id: I3b7222217e1f5d8b2a26f49b359d9c8587793e88
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/cjkoptions.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 2b9b4b18c3fb..90def9ac2ff1 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -22,7 +22,6 @@ #include <svl/languageoptions.hxx> #include <i18nlangtag/lang.h> #include <unotools/configitem.hxx> -#include <tools/debug.hxx> #include <tools/solar.h> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.hxx> @@ -171,8 +170,8 @@ void SvtCJKOptions_Impl::Load() Sequence< sal_Bool > aROStates = GetReadOnlyStates(rPropertyNames); const Any* pValues = aValues.getConstArray(); const sal_Bool* pROStates = aROStates.getConstArray(); - DBG_ASSERT( aValues.getLength() == rPropertyNames.getLength(), "GetProperties failed" ); - DBG_ASSERT( aROStates.getLength() == rPropertyNames.getLength(), "GetReadOnlyStates failed" ); + assert(aValues.getLength() == rPropertyNames.getLength() && "GetProperties failed"); + assert(aROStates.getLength() == rPropertyNames.getLength() && "GetReadOnlyStates failed"); if ( aValues.getLength() == rPropertyNames.getLength() && aROStates.getLength() == rPropertyNames.getLength() ) { for ( int nProp = 0; nProp < rPropertyNames.getLength(); nProp++ ) @@ -411,61 +410,61 @@ SvtCJKOptions::~SvtCJKOptions() bool SvtCJKOptions::IsCJKFontEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsCJKFontEnabled(); } bool SvtCJKOptions::IsVerticalTextEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsVerticalTextEnabled(); } bool SvtCJKOptions::IsAsianTypographyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsAsianTypographyEnabled(); } bool SvtCJKOptions::IsJapaneseFindEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsJapaneseFindEnabled(); } bool SvtCJKOptions::IsRubyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsRubyEnabled(); } bool SvtCJKOptions::IsChangeCaseMapEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsChangeCaseMapEnabled(); } bool SvtCJKOptions::IsDoubleLinesEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsDoubleLinesEnabled(); } void SvtCJKOptions::SetAll(bool bSet) { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); pCJKOptions->SetAll(bSet); } bool SvtCJKOptions::IsAnyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsAnyEnabled(); } bool SvtCJKOptions::IsReadOnly(EOption eOption) const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); + assert(pCJKOptions->IsLoaded()); return pCJKOptions->IsReadOnly(eOption); } |