diff options
| author | Shubham Goyal <22shubh22@gmail.com> | 2020-01-26 13:25:38 +0530 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-12 09:19:46 +0100 |
| commit | f61e5e85c6bc3337eabfe3b9b69c4c1a3abf08e7 (patch) | |
| tree | 7c38f49f5ec29a67263a56cce955d94924787257 /cui | |
| parent | 1e0b16f8695498e4eea7c2208aabf7e7664ce749 (diff) | |
tdf#43157 Clean up DBG_ASSERT
Change-Id: Ie41f91f873d7cada5e738d758ad6b677adcee989
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87428
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 7f36bd8ddc85..fdeb3a36b780 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -20,6 +20,7 @@ #include <iconcdlg.hxx> #include <cuihyperdlg.hxx> +#include <cassert> #include <sal/log.hxx> #include <vcl/svapp.hxx> @@ -121,7 +122,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ResetHdl, weld::Button&, void) ResetPageImpl (); IconChoicePageData* pData = GetPageData ( msCurrentPageId ); - DBG_ASSERT( pData, "ID not known" ); + assert( pData && "ID not known " ); pData->xPage->Reset( *pSet ); } @@ -133,22 +134,20 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ResetHdl, weld::Button&, void) \**********************************************************************/ void SvxHpLinkDlg::ActivatePageImpl() { - DBG_ASSERT( !maPageList.empty(), "no Pages registered" ); + assert( !maPageList.empty() && "no Pages registered " ); IconChoicePageData* pData = GetPageData ( msCurrentPageId ); - DBG_ASSERT( pData, "ID not known" ); - if ( pData ) - { - if ( pData->bRefresh ) - { - pData->xPage->Reset( *pSet ); - pData->bRefresh = false; - } + assert( pData && "ID not known " ); - if ( pExampleSet ) - pData->xPage->ActivatePage( *pExampleSet ); - m_xDialog->set_help_id(pData->xPage->GetHelpId()); + if ( pData->bRefresh ) + { + pData->xPage->Reset( *pSet ); + pData->bRefresh = false; } + if ( pExampleSet ) + pData->xPage->ActivatePage( *pExampleSet ); + m_xDialog->set_help_id(pData->xPage->GetHelpId()); + m_xResetBtn->show(); } @@ -216,7 +215,7 @@ void SvxHpLinkDlg::ResetPageImpl () { IconChoicePageData *pData = GetPageData ( msCurrentPageId ); - DBG_ASSERT( pData, "ID not known" ); + assert( pData && "ID not known " ); pData->xPage->Reset( *pSet ); } |