summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorMarcel Metz <mmetz@adrian-broher.net>2012-01-15 11:48:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-23 23:28:50 +0100
commit89f0655ebadb1aa9be31d854dfe5476e2b16e64c (patch)
tree20b96b8e860c738e33ceeb0f7d74817def90f564 /toolkit
parentf9e6d195dbbf0b2effa10f69f4c99fce6e2b186b (diff)
Replaced diagnore ENSURE_OR_CONTINUE with regular code.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 32f5b3d5cae4..9c0fd9ad09bd 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -178,7 +178,12 @@ namespace toolkit
)
{
GridColumn* pColumnImpl = GridColumn::getImplementation( *updatePos );
- ENSURE_OR_CONTINUE( pColumnImpl, "DefaultGridColumnModel::removeColumn: invalid column implementation!" );
+ if ( !pColumnImpl )
+ {
+ SAL_WARN( "toolkit.controls", "DefaultGridColumnModel::removeColumn: invalid column implementation!" );
+ continue;
+ }
+
pColumnImpl->setIndex( columnIndex );
}