From 89f0655ebadb1aa9be31d854dfe5476e2b16e64c Mon Sep 17 00:00:00 2001
From: Marcel Metz <mmetz@adrian-broher.net>
Date: Sun, 15 Jan 2012 11:48:11 +0100
Subject: Replaced diagnore ENSURE_OR_CONTINUE with regular code.

---
 svtools/source/uno/svtxgridcontrol.cxx      | 6 +++++-
 svtools/source/uno/unocontroltablemodel.cxx | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'svtools')

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();
-- 
cgit