diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-09 08:50:37 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-13 18:14:11 +0200 |
commit | cbce40e965acef51822b31d73da5fbc271fbcad0 (patch) | |
tree | bad77c67c68055f7597b8ecf1df1b74e778873cf /editeng | |
parent | 429280541ff1fbbbf3f0482211a659c96c3347d2 (diff) |
Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds
...to avoid lots of loplugin:staticmethods warnings. Also enables DBG_ASSERT
etc. also for --enable-debug builds in addition to --enable-dbgutil builds.
Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/textconv.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 060fd80c76c1..43a3877543fd 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -396,8 +396,10 @@ void TextConvWrapper::ReplaceUnit( if (pNewUnitLanguage) { +#ifdef DBG_UTIL DBG_ASSERT(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ), "similar language should not be changed!"); +#endif SetLanguageAndFont( aNewSel, *pNewUnitLanguage, EE_CHAR_LANGUAGE_CJK, GetTargetFont(), EE_CHAR_FONTINFO_CJK ); } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index b77aeec9ae0b..5ff05a1719dd 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -679,10 +679,7 @@ namespace editeng } else { -#ifdef DBG_UTIL - const bool bCompletelyDone = -#endif - ContinueConversion( false ); + const bool bCompletelyDone = ContinueConversion( false ); DBG_ASSERT( bCompletelyDone, "HangulHanjaConversion_Impl::DoDocumentConversion: ContinueConversion should have returned true here!" ); } } |