diff options
| author | Marcel Metz <mmetz@adrian-broher.net> | 2012-01-15 11:48:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 23:28:50 +0100 |
| commit | 89f0655ebadb1aa9be31d854dfe5476e2b16e64c (patch) | |
| tree | 20b96b8e860c738e33ceeb0f7d74817def90f564 /svtools | |
| parent | Replaced diagnore ENSURE_OR_BREAK with regular code. (diff) | |
| download | core-89f0655ebadb1aa9be31d854dfe5476e2b16e64c.tar.gz core-89f0655ebadb1aa9be31d854dfe5476e2b16e64c.zip | |
Replaced diagnore ENSURE_OR_CONTINUE with regular code.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/svtxgridcontrol.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/uno/unocontroltablemodel.cxx | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 4cf1a854e3d2..0a874af0a54f 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -781,7 +781,11 @@ void SVTXGridControl::impl_updateColumnsFromModel_nothrow() ++colRef ) { - ENSURE_OR_CONTINUE( colRef->is(), "illegal column!" ); + if ( !colRef->is() ) + { + SAL_WARN( "svtools.uno", "illegal column!" ); + continue; + } m_pTableModel->appendColumn( *colRef ); } diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index 015dd67c6f76..f6cd8944451d 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -323,7 +323,12 @@ namespace svt { namespace table ) { UnoGridColumnFacade* pColumn = dynamic_cast< UnoGridColumnFacade* >( col->get() ); - ENSURE_OR_CONTINUE( pColumn != NULL, "UnoControlTableModel::removeAllColumns: illegal column implementation!" ); + if ( !pColumn ) + { + SAL_WARN( "svtools.uno", "UnoControlTableModel::removeAllColumns: illegal column implementation!" ); + continue; + } + pColumn->dispose(); } m_pImpl->aColumns.clear(); |