Move OSL_ENSURE(0,...) to OSL_FAIL(...)

73 files changed, 150 insertions, 150 deletions

diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 88eafa3c7d3a..5224d80b7589 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -137,11 +137,11 @@ OCacheSet::~OCacheSet()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception occurred");
+        OSL_FAIL("Exception occurred");
     }
     catch(...)
     {
-        OSL_ENSURE(0,"Unknown Exception occurred");
+        OSL_FAIL("Unknown Exception occurred");
     }
 
     DBG_DTOR(OCacheSet,NULL);
@@ -676,7 +676,7 @@ bool OCacheSet::isResultSetChanged() const
 
 void OCacheSet::reset(const Reference< XResultSet>& /*_xDriverSet*/)
 {
-    OSL_ENSURE(0,"Illegal call!");
+    OSL_FAIL("Illegal call!");
 }
 
 void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector<sal_Int32>& o_aChangedColumns)
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 9bfc64370195..acc2d3ef337f 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -97,7 +97,7 @@ namespace dbaccess
             if(aIter != m_aColumns->get().end())
                 return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY);
 
-            OSL_ENSURE(0,"Column not found in collection!");
+            OSL_FAIL("Column not found in collection!");
         }
         return NULL;
     }
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 78eceea4dbcd..44f5ebc0c737 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -133,7 +133,7 @@ OKeySet::~OKeySet()
     }
     catch(...)
     {
-        OSL_ENSURE(0,"Unknown Exception occurred");
+        OSL_FAIL("Unknown Exception occurred");
     }
     m_xComposer = NULL;
 
@@ -764,7 +764,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"Could not execute GeneratedKeys() stmt");
+            OSL_FAIL("Could not execute GeneratedKeys() stmt");
         }
     }
 
@@ -823,7 +823,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString
             }
             catch(SQLException&)
             {
-                OSL_ENSURE(0,"Could not fetch with MAX() ");
+                OSL_FAIL("Could not fetch with MAX() ");
             }
         }
     }
@@ -975,7 +975,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
             aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName));
             if((_rDeleteRow->get())[aIter->second.nPosition].isNull())
             {
-                OSL_ENSURE(0,"can a primary key be null");
+                OSL_FAIL("can a primary key be null");
                 aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")));
             }
             else
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 02e84ea2b932..750c03617890 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -230,7 +230,7 @@ ORowSet::~ORowSet()
 {
     if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
     {
-        OSL_ENSURE(0, "Please check who doesn't dispose this component!");
+        OSL_FAIL("Please check who doesn't dispose this component!");
         osl_incrementInterlockedCount( &m_refCount );
         dispose();
     }
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 5a6816aae17e..2af2ef12587e 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -240,7 +240,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getValue" );
     if ( m_bBeforeFirst || m_bAfterLast )
     {
-        OSL_ENSURE(0,"ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
+        OSL_FAIL("ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
     }
 
@@ -382,7 +382,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
 
     if ( m_bBeforeFirst || m_bAfterLast )
     {
-        OSL_ENSURE(0,"ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
+        OSL_FAIL("ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
     }
 
@@ -478,9 +478,9 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
     if(!bookmark.hasValue() || m_nResultSetType == ResultSetType::FORWARD_ONLY)
     {
         if(bookmark.hasValue())
-            OSL_ENSURE(0,"MoveToBookmark is not possible when we are only forward");
+            OSL_FAIL("MoveToBookmark is not possible when we are only forward");
         else
-            OSL_ENSURE(0,"Bookmark is not valid");
+            OSL_FAIL("Bookmark is not valid");
         throwFunctionSequenceException(*m_pMySelf);
     }
 
@@ -1285,7 +1285,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"firePropertyChange: Exception");
+        OSL_FAIL("firePropertyChange: Exception");
     }
     OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
 }
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 1b1a60090a25..671046009d15 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -847,7 +847,7 @@ sal_Bool ORowSetCache::moveWindow()
             }
             else
             { // normally this should never happen
-                OSL_ENSURE(0,"What the hell is happen here!");
+                OSL_FAIL("What the hell is happen here!");
                 return sal_False;
             }
         }
@@ -1228,7 +1228,7 @@ sal_Bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks)
         }
         else
         {
-            OSL_ENSURE(0,"There must be a bookmark after the row was inserted!");
+            OSL_FAIL("There must be a bookmark after the row was inserted!");
         }
     }
     return bRet;
@@ -1317,7 +1317,7 @@ void ORowSetCache::cancelRowUpdates(  )
     m_bNew = m_bModified = sal_False;
     if(!m_nPosition)
     {
-        OSL_ENSURE(0,"cancelRowUpdates:Invalid positions pos == 0");
+        OSL_FAIL("cancelRowUpdates:Invalid positions pos == 0");
         ::dbtools::throwFunctionSequenceException(NULL);
     }
 
@@ -1325,7 +1325,7 @@ void ORowSetCache::cancelRowUpdates(  )
         m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition);
     else
     {
-        OSL_ENSURE(0,"cancelRowUpdates couldn't position right with absolute");
+        OSL_FAIL("cancelRowUpdates couldn't position right with absolute");
         ::dbtools::throwFunctionSequenceException(NULL);
     }
 }
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 3a337481ffba..3374efa4f828 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1122,7 +1122,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
             nPredicate = SQLFilterOperator::GREATER_EQUAL;
             break;
         default:
-            OSL_ENSURE(0,"Wrong NodeType!");
+            OSL_FAIL("Wrong NodeType!");
     }
     return nPredicate;
 }
@@ -1793,7 +1793,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
     switch(_ePart)
     {
         default:
-            OSL_ENSURE( 0, "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" );
+            OSL_FAIL( "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" );
             // no break, fallback to WHERE
         case Where:
             sKeyword = STR_WHERE;
@@ -1831,7 +1831,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
             F_tmp = TGetParseNode(&OSQLParseTreeIterator::getSimpleOrderTree);
             break;
         default:
-            OSL_ENSURE(0,"Invalid enum value!");
+            OSL_FAIL("Invalid enum value!");
     }
 
     ::rtl::OUString sRet = getStatementPart( F_tmp, _rIterator );
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 40bf99774f95..d2b724f68a04 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -187,7 +187,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
     switch(_nHandle)
     {
         case PROPERTY_ID_PRIVILEGES:
-            OSL_ENSURE(0,"Property is readonly!");
+            OSL_FAIL("Property is readonly!");
         case PROPERTY_ID_FILTER:
         case PROPERTY_ID_ORDER:
         case PROPERTY_ID_APPLYFILTER:
@@ -326,7 +326,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
             }
             break;
         default:
-            OSL_ENSURE(0,"Invalid Handle for table");
+            OSL_FAIL("Invalid Handle for table");
     }
 }
 
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 9c446a18ff1f..128595fea054 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -98,7 +98,7 @@ namespace
                 }
                 catch(Exception)
                 {
-                    OSL_ENSURE( 0, "lcl_isPropertySetDefaulted: Exception caught!" );
+                    OSL_FAIL( "lcl_isPropertySetDefaulted: Exception caught!" );
                 }
             }
             return ( pIter == pEnd );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 5e7cedb6bc83..7b5baa1d5f8e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1345,7 +1345,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
+        OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
     }
     return sal_True;
 }
@@ -1454,7 +1454,7 @@ sal_Bool ODocumentDefinition::saveAs()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
+        OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
     }
     return sal_True;
 }
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index 819c15ece69d..d3e7460f6518 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -489,7 +489,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
     }
     catch(Exception)
     {
-        OSL_ENSURE(0,"isDocumentReport: catched exception!");
+        OSL_FAIL("isDocumentReport: catched exception!");
     }
     return bReport;
 }
@@ -549,7 +549,7 @@ void OCfgImport::createDataSource(const ::rtl::OUString& _sName)
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception: convert");
+        OSL_FAIL("Exception: convert");
         UCBContentHelper::Kill(sFileName);
     }
 }
@@ -848,7 +848,7 @@ void SAL_CALL  OCfgImport::endNode()
                 }
                 catch(Exception&)
                 {
-                    OSL_ENSURE(0,"convertLinks: Exception catched!");
+                    OSL_FAIL("convertLinks: Exception catched!");
                 }
                 m_sBookmarkName = ::rtl::OUString();
                 m_sDocumentLocation = ::rtl::OUString();
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index 25ec65a48c7b..3695f24c6590 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -99,7 +99,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext(
             if ( !m_bFoundOne )
             {
                 m_bFoundOne = true;
-                OSL_ENSURE(0,"Not supported yet!");
+                OSL_FAIL("Not supported yet!");
             }
             break;
     }
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index c02ac3918330..39cb22e01d15 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1325,7 +1325,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
             }
             catch(Exception)
             {
-                OSL_ENSURE(0,"ODBExport::GetViewSettings: Exception catched!");
+                OSL_FAIL("ODBExport::GetViewSettings: Exception catched!");
             }
         }
     }
@@ -1352,7 +1352,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
         }
         catch(Exception)
         {
-            OSL_ENSURE(0,"Could not access layout information from the data source!");
+            OSL_FAIL("Could not access layout information from the data source!");
         }
     }
 }
@@ -1383,7 +1383,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
             GetMM100UnitConverter().convertNumber(aBuffer, getINT32(_rValue));
             break;
         default:
-            OSL_ENSURE(0,"ODBExport::implConvertAny: Invalid type");
+            OSL_FAIL("ODBExport::implConvertAny: Invalid type");
     }
 
     return aBuffer.makeStringAndClear();
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 24a3c39b65a8..4b3639d1300f 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -109,7 +109,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched");
+            OSL_FAIL("OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched");
         }
     }
 }
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 64bbc301a618..dd083f616e33 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -145,7 +145,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched");
+        OSL_FAIL("OXMLTable::EndElement -> exception catched");
     }
 }
 //----------------------------------------------------------------------------
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 9d95794e3ec0..21958d06a28e 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -186,7 +186,7 @@ void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp )
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched");
+        OSL_FAIL("OXMLTable::EndElement -> exception catched");
     }
 }
 // -----------------------------------------------------------------------------
@@ -219,7 +219,7 @@ void OXMLTable::EndElement()
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched");
+            OSL_FAIL("OXMLQuery::EndElement -> exception catched");
         }
     }
 
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 699a4554c158..6bd3ec193b6f 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -336,7 +336,7 @@ OApplicationController::~OApplicationController()
 {
     if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
     {
-        OSL_ENSURE(0,"Please check who doesn't dispose this component!");
+        OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
         osl_incrementInterlockedCount( &m_refCount );
         dispose();
@@ -1276,7 +1276,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
                         case ID_NEW_TABLE_DESIGN:
                             break;
                         default:
-                            OSL_ENSURE(0,"illegal switch call!");
+                            OSL_FAIL("illegal switch call!");
                     }
                     if ( bAutoPilot )
                         getContainer()->PostUserEvent( LINK( this, OApplicationController, OnCreateWithPilot ), reinterpret_cast< void* >( eType ) );
@@ -1697,7 +1697,7 @@ namespace
             case E_NONE:
                 break;
             default:
-                OSL_ENSURE(0,"Invalid ElementType!");
+                OSL_FAIL("Invalid ElementType!");
                 break;
         }
         return sToolbar;
@@ -2340,7 +2340,7 @@ void OApplicationController::onDeleteEntry()
             nId = SID_DB_APP_REPORT_DELETE;
             break;
         default:
-            OSL_ENSURE(0,"Invalid ElementType!");
+            OSL_FAIL("Invalid ElementType!");
             break;
     }
     executeChecked(nId,Sequence<PropertyValue>());
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 2642cbc12da0..2b29a33d2632 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -292,7 +292,7 @@ void OApplicationController::refreshTables()
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Could not refresh tables!");
+            OSL_FAIL("Could not refresh tables!");
         }
 
         getContainer()->getDetailView()->clearPages(sal_False);
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 068464c7830f..138e2d42f8ec 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -254,7 +254,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
     }
     catch(Exception)
     {
-        OSL_ENSURE(0,"Exception thrown while disposing preview frame!");
+        OSL_FAIL("Exception thrown while disposing preview frame!");
     }
 
     for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
@@ -682,7 +682,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
             break;
         default:
-            OSL_ENSURE(0,"Illegal call!");
+            OSL_FAIL("Illegal call!");
     }
     getElementIcons( _eType, nImageId );
 
@@ -859,7 +859,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType
                 pEntry = lcl_findEntry(*pTreeView,_rOldName,pTreeView->First());
                 break;
             default:
-                OSL_ENSURE(0,"Invalid element type");
+                OSL_FAIL("Invalid element type");
         }
         OSL_ENSURE(pEntry,"Do you know that the name isn't existence!");
         if ( pEntry )
@@ -944,7 +944,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr
                 }
                 break;
             default:
-                OSL_ENSURE(0,"Invalid element type");
+                OSL_FAIL("Invalid element type");
         }
         if ( !pTreeView->GetEntryCount() )
             showPreview(NULL);
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 80977b9a187a..da2acef4be09 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2023,7 +2023,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
             }
             catch(Exception&)
             {
-                OSL_ENSURE(0,"Exception caught!");
+                OSL_FAIL("Exception caught!");
             }
             break;
         case SID_FM_DELETEROWS:
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 9e39ac173874..1489be5f92b0 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -951,7 +951,7 @@ void SbaGridControl::SetRowHeight()
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception");
+            OSL_FAIL("setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception");
         }
     }
 }
@@ -1109,11 +1109,11 @@ Reference< XPropertySet >  SbaGridControl::getField(sal_uInt16 nModelPos)
                 xEmptyReturn.set(xCol->getPropertyValue(PROPERTY_BOUNDFIELD),UNO_QUERY);
         }
         else
-            OSL_ENSURE(0,"SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!");
+            OSL_FAIL("SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!");
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"SbaGridControl::getField Exception occurred!");
+        OSL_FAIL("SbaGridControl::getField Exception occurred!");
     }
 
     return xEmptyReturn;
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 72c1723180f2..f1e9e467dd45 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -250,7 +250,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
     DBG_DTOR(SbaTableQueryBrowser,NULL);
     if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
     {
-        OSL_ENSURE(0,"Please check who doesn't dispose this component!");
+        OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
         osl_incrementInterlockedCount( &m_refCount );
         dispose();
@@ -1895,7 +1895,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
                     }
                     catch(DisposedException&)
                     {
-                        OSL_ENSURE(0,"Object already disposed!");
+                        OSL_FAIL("Object already disposed!");
                     }
                     catch(Exception&)
                     {
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index e9d903697dba..484126c82da9 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1424,7 +1424,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
 
                 break;
             default:
-                OSL_ENSURE(0,"Unknown type");
+                OSL_FAIL("Unknown type");
         }
         m_pPreviousType = pFieldType;
     }
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 6a067dbbfafc..6b102c394253 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -702,7 +702,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"IsReadOnly throws an exception!");
+        OSL_FAIL("IsReadOnly throws an exception!");
     }
 }
 
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 5624420c904f..4a35b421af0d 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -310,7 +310,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
             pPage = ODriversSettings::CreateUser(this,*m_pOutSet);
             break;
         default:
-            OSL_ENSURE(0,"Wrong state!");
+            OSL_FAIL("Wrong state!");
             break;
     }
 
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 70ab3cc8b51f..75ed025ac6df 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -753,7 +753,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
         }
         else
         {
-            OSL_ENSURE(0,"DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!");
+            OSL_FAIL("DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!");
         }
     }
     pComp->SelectEntryPos(0);
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index b2cf2a0fb2d6..c31a2da8c9e0 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -560,7 +560,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
                     }
                     break;
                 default:
-                    OSL_ENSURE(0,"ODatabaseExport: Unbekanntes Format");
+                    OSL_FAIL("ODatabaseExport: Unbekanntes Format");
             }
         }
     }
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 70b127cc2ec6..c8a2664f3771 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -242,7 +242,7 @@ sal_Bool ORowSetImportExport::insertNewRow()
                         aValue <<= m_xRow->getClob(*aIter);
                         break;
                     default:
-                        OSL_ENSURE(0,"Unknown type");
+                        OSL_FAIL("Unknown type");
                 }
                 if(m_xRow->wasNull())
                     m_xTargetRowUpdate->updateNull(i);
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index a736feb134f0..3f7daabd1674 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -627,7 +627,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
             }
             catch (Exception&)
             {
-                OSL_ENSURE(0,"RTF WRITE!");
+                OSL_FAIL("RTF WRITE!");
             }
 
             (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 0a949d24703e..7dfb0152bf82 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -178,7 +178,7 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
     SQLExceptionInfo aInfo;
     if ( !_xDataSource.is() )
     {
-        OSL_ENSURE(0,"createConnection: coult not retrieve the data source!");
+        OSL_FAIL("createConnection: coult not retrieve the data source!");
         return aInfo;
     }
 
@@ -192,7 +192,7 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"createConnection: error while retrieving data source properties!");
+        OSL_FAIL("createConnection: error while retrieving data source properties!");
     }
 
 
@@ -203,7 +203,7 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
             Reference<XCompletedConnection> xConnectionCompletion(_xDataSource, UNO_QUERY);
             if (!xConnectionCompletion.is())
             {
-                OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!");
+                OSL_FAIL("createConnection: missing an interface ... need an error message here!");
             }
             else
             {   // instantiate the default SDB interaction handler
@@ -230,7 +230,7 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
     catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); }
     catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
     catch(SQLException& e) { aInfo = SQLExceptionInfo(e); }
-    catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
+    catch(Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
 
     return aInfo;
 }
@@ -796,7 +796,7 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment)
         case SVX_HOR_JUSTIFY_CENTER:    nAlignment = ::com::sun::star::awt::TextAlign::CENTER;  break;
         case SVX_HOR_JUSTIFY_RIGHT:     nAlignment = ::com::sun::star::awt::TextAlign::RIGHT;   break;
         default:
-            OSL_ENSURE(0,"Invalid TextAlign!");
+            OSL_FAIL("Invalid TextAlign!");
     }
     return nAlignment;
 }
@@ -810,7 +810,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment)
         case ::com::sun::star::awt::TextAlign::CENTER   : eJustify = SVX_HOR_JUSTIFY_CENTER; break;
         case ::com::sun::star::awt::TextAlign::RIGHT    : eJustify = SVX_HOR_JUSTIFY_RIGHT; break;
         default:
-            OSL_ENSURE(0,"Invalid TextAlign!");
+            OSL_FAIL("Invalid TextAlign!");
     }
     return eJustify;
 }
@@ -838,7 +838,7 @@ float ConvertFontWeight( ::FontWeight eWeight )
     else if( eWeight == WEIGHT_BLACK )
         return ::com::sun::star::awt::FontWeight::BLACK;
 
-    OSL_ENSURE(0, "Unknown FontWeigth" );
+    OSL_FAIL("Unknown FontWeigth" );
     return ::com::sun::star::awt::FontWeight::DONTKNOW;
 }
 // -----------------------------------------------------------------------------
@@ -865,7 +865,7 @@ float ConvertFontWidth( ::FontWidth eWidth )
     else if( eWidth == WIDTH_ULTRA_EXPANDED )
         return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED;
 
-    OSL_ENSURE(0, "Unknown FontWidth" );
+    OSL_FAIL("Unknown FontWidth" );
     return ::com::sun::star::awt::FontWidth::DONTKNOW;
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 1cfa991c5b7e..0d5a8204b02d 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -464,7 +464,7 @@ TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl:
     OJoinDesignView* pView = getJoinView();
     if( pView )
         return pView->getTableView()->createTableWindowData(_sComposedName,_sTableName,_sWindowName);
-    OSL_ENSURE(0,"We should never ever reach this point!");
+    OSL_FAIL("We should never ever reach this point!");
 
     return TTableWindowData::value_type();
 }
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index ece9f28458f9..b32242652983 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -212,7 +212,7 @@ namespace
                 if(aFind.getLength())
                     pNewConnData->SetFieldIndex(JTCS_FROM,aFind[0]+1);
                 else
-                    OSL_ENSURE(0,"Column not found!");
+                    OSL_FAIL("Column not found!");
             }
             // get the position inside the tabe
             Reference<XNameAccess> xRefColumns = _rDest.GetOriginalColumns();
@@ -222,7 +222,7 @@ namespace
                 if(aFind.getLength())
                     pNewConnData->SetFieldIndex(JTCS_TO,aFind[0]+1);
                 else
-                    OSL_ENSURE(0,"Column not found!");
+                    OSL_FAIL("Column not found!");
             }
             pNewConnData->AppendConnLine(*pIter,sRelatedColumn);
 
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 726f4680c9a1..ae1ae932806b 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -336,7 +336,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
         }
     }
     else
-        OSL_ENSURE(0,"Invalid column id!");
+        OSL_FAIL("Invalid column id!");
 }
 //------------------------------------------------------------------------------
 void OSelectionBrowseBox::Init()
@@ -387,7 +387,7 @@ void OSelectionBrowseBox::Init()
     }
     catch(const SQLException&)
     {
-        OSL_ENSURE(0,"Catched Exception when asking for database metadata options!");
+        OSL_FAIL("Catched Exception when asking for database metadata options!");
         m_nMaxColumns = 0;
     }
 }
@@ -846,7 +846,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
                         notifyFunctionFieldChanged(sOldLocalizedFunctionName,sLocalizedFunctionName,_bListAction, nColumnId);
                     }
                     else
-                        OSL_ENSURE(0,"Unsupported function inserted!");
+                        OSL_FAIL("Unsupported function inserted!");
 
                 }
                 else
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index c40cd4e519a5..7eca4f2f9b5b 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -205,7 +205,7 @@ BOOL OTableWindow::FillListBox()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception occurred!");
+        OSL_FAIL("Exception occurred!");
     }
     try
     {
@@ -234,7 +234,7 @@ BOOL OTableWindow::FillListBox()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception occurred!");
+        OSL_FAIL("Exception occurred!");
     }
 
     return TRUE;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 5e6ad7f9ab9a..fe761cc4ca4f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -361,7 +361,7 @@ OQueryController::~OQueryController()
     DBG_DTOR(OQueryController,NULL);
     if ( !getBroadcastHelper().bDisposed && !getBroadcastHelper().bInDispose )
     {
-        OSL_ENSURE(0,"Please check who doesn't dispose this component!");
+        OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
         osl_incrementInterlockedCount( &m_refCount );
         dispose();
@@ -1350,12 +1350,12 @@ void OQueryController::executeQuery()
             }
             else
             {
-                OSL_ENSURE(0,"Couldn't create a beamer window!");
+                OSL_FAIL("Couldn't create a beamer window!");
             }
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Couldn't create a beamer window!");
+            OSL_FAIL("Couldn't create a beamer window!");
         }
     }
 }
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index c05c1a3a2d18..e42211609361 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -234,7 +234,7 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"ORelationTableView::AddConnection: Exception oocured!");
+            OSL_FAIL("ORelationTableView::AddConnection: Exception oocured!");
         }
     }
 }
@@ -301,7 +301,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occurred!");
+        OSL_FAIL("ORelationTableView::RemoveConnection: Something other than SQLException occurred!");
     }
     return false;
 }
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index e3c41b1846f7..6afad1cd9040 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1305,7 +1305,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
         m_pRowList->size());
     if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) )
     {
-        OSL_ENSURE(0,"(nRow<0) || (nRow>=nListCount)");
+        OSL_FAIL("(nRow<0) || (nRow>=nListCount)");
         return NULL;
     }
      ::boost::shared_ptr<OTableRow>  pRow = (*m_pRowList)[ nRow ];
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 4c3ef7d87cd4..e34436da74e6 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -201,7 +201,7 @@ void OTableRowView::copy()
 //------------------------------------------------------------------------------
 void OTableRowView::paste()
 {
-    OSL_ENSURE(0,"OTableRowView::Paste : (pseudo-) abstract method called !");
+    OSL_FAIL("OTableRowView::Paste : (pseudo-) abstract method called !");
 }
 
 //------------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index a409f13bdf43..6db745085f61 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -188,7 +188,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"OFixedLine::OFixedLine: Exception caught!");
+        OSL_FAIL("OFixedLine::OFixedLine: Exception caught!");
     }
     osl_decrementInterlockedCount( &m_refCount );
 }
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 7c0b013879bd..4bec3a6fa7c9 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -769,7 +769,7 @@ void OReportDefinition::init()
     }
     catch(uno::Exception)
     {
-        OSL_ENSURE(0,"Error!");
+        OSL_FAIL("Error!");
     }
 }
 // -----------------------------------------------------------------------------
@@ -1183,7 +1183,7 @@ void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterfac
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone(  ) throw (uno::RuntimeException)
 {
-    OSL_ENSURE(0,"Not yet implemented correctly");
+    OSL_FAIL("Not yet implemented correctly");
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XReportDefinition> xSet(cloneObject(xSource,m_aProps->m_xFactory,SERVICE_REPORTDEFINITION),uno::UNO_QUERY_THROW);
     return xSet.get();
@@ -1600,7 +1600,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
         }
         catch(uno::Exception)
         {
-            OSL_ENSURE(0,"Exception Caught: Could not commit report storage!");
+            OSL_FAIL("Exception Caught: Could not commit report storage!");
             throw io::IOException();
         }
 
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 09d9b1037b3b..b645d3b3a812 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -164,7 +164,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"Exception catched!");
+            OSL_FAIL("Exception catched!");
         }
         m_bInChange = sal_False;
     }
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 5fd634c61264..f2dab3fc8e12 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -93,7 +93,7 @@ void OReportModel::detachController()
 SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
 {
     DBG_CHKTHIS( rpt_OReportModel, 0);
-    OSL_ENSURE(0,"Who called me!");
+    OSL_FAIL("Who called me!");
     return NULL;
 }
 
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 9410c75019e6..573bce8980df 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -172,7 +172,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
             pNewObj = OOle2Obj::Create( _xComponent,nType );
             break;
         default:
-            OSL_ENSURE(0,"Unknown object id");
+            OSL_FAIL("Unknown object id");
             break;
     }
 
@@ -205,7 +205,7 @@ namespace
                         nTextAlign = style::ParagraphAdjust_RIGHT;
                         break;
                     default:
-                        OSL_ENSURE(0,"Illegal text alignment value!");
+                        OSL_FAIL("Illegal text alignment value!");
                         break;
                 }
                 aRet <<= (style::ParagraphAdjust)nTextAlign;
@@ -228,7 +228,7 @@ namespace
                         nTextAlign = awt::TextAlign::RIGHT;
                         break;
                     default:
-                        OSL_ENSURE(0,"Illegal text alignment value!");
+                        OSL_FAIL("Illegal text alignment value!");
                         break;
                 }
                 aRet <<= nTextAlign;
@@ -396,7 +396,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
             }
             catch(uno::Exception)
             {
-                OSL_ENSURE(0,"OObjectBase::EndListening: Exception caught!");
+                OSL_FAIL("OObjectBase::EndListening: Exception caught!");
             }
         }
         m_xPropertyChangeListener.clear();
@@ -532,7 +532,7 @@ sal_Int32 OCustomShape::GetStep() const
 {
     // get step property
     sal_Int32 nStep = 0;
-    OSL_ENSURE(0,"Who called me!");
+    OSL_FAIL("Who called me!");
     return nStep;
 }
 //----------------------------------------------------------------------------
@@ -718,7 +718,7 @@ sal_Int32 OUnoObject::GetStep() const
     DBG_CHKTHIS( rpt_OUnoObject,NULL);
     // get step property
     sal_Int32 nStep = 0;
-    OSL_ENSURE(0,"Who called me!");
+    OSL_FAIL("Who called me!");
     return nStep;
 }
 
@@ -1013,7 +1013,7 @@ sal_Int32 OOle2Obj::GetStep() const
     DBG_CHKTHIS( rpt_OOle2Obj,NULL);
     // get step property
     sal_Int32 nStep = 0;
-    OSL_ENSURE(0,"Who called me!");
+    OSL_FAIL("Who called me!");
     return nStep;
 }
 
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 737e43af74be..9a4d66740f17 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -224,7 +224,7 @@ void OUndoContainerAction::Undo()
                 implReInsert();
                 break;
             default:
-                OSL_ENSURE(0,"Illegal case value");
+                OSL_FAIL("Illegal case value");
                 break;
             }
         }
@@ -252,7 +252,7 @@ void OUndoContainerAction::Redo()
                 implReRemove();
                 break;
             default:
-                OSL_ENSURE(0,"Illegal case value");
+                OSL_FAIL("Illegal case value");
                 break;
             }
         }
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index f47f360c4687..868a73002315 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -245,7 +245,7 @@ void OXMLCell::EndElement()
                }
             catch(uno::Exception&)
             {
-                OSL_ENSURE(0,"OXMLCell::EndElement -> exception catched");
+                OSL_FAIL("OXMLCell::EndElement -> exception catched");
             }
         }
     }
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index dd1387db40da..aa8da4c42b62 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -98,7 +98,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Exception catched while putting props into report component!");
+            OSL_FAIL("Exception catched while putting props into report component!");
         }
     }
 }
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 16135095268a..56eb0c4eabb9 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -81,7 +81,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
     }
     catch(const Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while putting Function props!");
+        OSL_FAIL("Exception catched while putting Function props!");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index c156b7ffd58e..89fe02a0336a 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -165,7 +165,7 @@ void OXMLControlProperty::EndElement()
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Unknown property found!");
+            OSL_FAIL("Unknown property found!");
         }
     }
 }
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 5794e46a9886..e79603a6294b 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Can not access format condition!");
+        OSL_FAIL("Can not access format condition!");
     }
 }
 // -----------------------------------------------------------------------------
@@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
                 }
                 catch(uno::Exception&)
                 {
-                    OSL_ENSURE(0,"Can not access format condition!");
+                    OSL_FAIL("Can not access format condition!");
                 }
             }
         }
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 9f3c7e5e3c8e..faec25209fbf 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -106,7 +106,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16   _nControl)
             m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")));
             break;
         default:
-            OSL_ENSURE(0,"Not supported control character");
+            OSL_FAIL("Not supported control character");
             break;
     }
 }
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 6d70a78ec147..71b4f05f95be 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -95,7 +95,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the report definition props");
+        OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 65fdbe1ee81f..73fd83dc474d 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -92,7 +92,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the report definition props");
+        OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index fd0ede7b2244..998e40839bd2 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -101,7 +101,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Exception catched while putting Function props!");
+            OSL_FAIL("Exception catched while putting Function props!");
         }
     }
 }
@@ -132,7 +132,7 @@ void OXMLFunction::EndElement()
             m_xFunction.clear();
         }catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"Exception catched!");
+            OSL_FAIL("Exception catched!");
         }
     }
 }
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index c5fad4d165cd..d2524371ae98 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -193,7 +193,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
         }
         catch(const Exception&)
         {
-            OSL_ENSURE(0,"Exception catched while putting group props!");
+            OSL_FAIL("Exception catched while putting group props!");
         }
     }
 }
@@ -271,7 +271,7 @@ void OXMLGroup::EndElement()
         m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup));
     }catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception catched!");
+        OSL_FAIL("Exception catched!");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index c00b0cd579ea..8446bf6bdd5f 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -330,7 +330,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty
            }
         catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"OXMLHelper::copyStyleElements -> exception catched");
+            OSL_FAIL("OXMLHelper::copyStyleElements -> exception catched");
         }
     }
 }
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index ab7567214fdf..0e254e92eab2 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -114,7 +114,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the image props");
+        OSL_FAIL("Exception catched while filling the image props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index a0f883c8ad2a..c2dea15b7023 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -233,7 +233,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
         }
         catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"Exception catched while filling the report definition props");
+            OSL_FAIL("Exception catched while filling the report definition props");
         }
         bExport = false;
     }
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 6990c9144b20..3edb30acd555 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -111,7 +111,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the report definition props");
+        OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 2ef2ad192423..6ed989c06dbb 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -85,7 +85,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the report definition props");
+        OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 01de1e714bf9..0a86638028b9 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -108,7 +108,7 @@ void OXMLReportElementBase::EndElement()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception caught while inserting a new control!");
+        OSL_FAIL("Exception caught while inserting a new control!");
     }
 }
 //----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 098858190d28..5d19b6e9c202 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -102,13 +102,13 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
                     break;
 
                 default:
-                    OSL_ENSURE(0,"OXMLSection: Unknown attribute!");
+                    OSL_FAIL("OXMLSection: Unknown attribute!");
             }
         }
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the section props");
+        OSL_FAIL("Exception catched while filling the section props");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index e93e7f37a3e9..eab257017a91 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -311,7 +311,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext(
                                                xAttrList, *this, nFamily );
             break;
         default:
-            OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
+            OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
             break;
         }
     }
@@ -368,7 +368,7 @@ Reference < XNameContainer >
                 xStyles = ((SvXMLImport *)&GetImport())->GetTextImport()->GetFrameStyles();
                 break;
             default:
-                OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
+                OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check.");
                 break;
         }
         if( !xStyles.is() && sName.getLength() && GetOwnImport().GetModel().is() )
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 63ed9b92f77e..847752adaeae 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -144,7 +144,7 @@ void OXMLSubDocument::EndElement()
                 }
                 catch(uno::Exception&)
                 {
-                    OSL_ENSURE(0,"Can not access format condition!");
+                    OSL_FAIL("Can not access format condition!");
                 }
 
             }
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 78ff08494a5e..92fbf0658867 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -122,7 +122,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while filling the section props");
+        OSL_FAIL("Exception catched while filling the section props");
     }
 }
 // -----------------------------------------------------------------------------
@@ -269,7 +269,7 @@ void OXMLTable::EndElement()
                                 }
                                 catch(beans::PropertyVetoException)
                                 {
-                                    OSL_ENSURE(0,"Could not set the correct position or size!");
+                                    OSL_FAIL("Could not set the correct position or size!");
                                 }
                             }
                         }
@@ -282,7 +282,7 @@ void OXMLTable::EndElement()
     }
     catch(Exception&)
     {
-        OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched");
+        OSL_FAIL("OXMLTable::EndElement -> exception catched");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 898779094953..343d82b67b9d 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -394,7 +394,7 @@ namespace rptui
         }
         catch(Exception&)
         {
-            OSL_ENSURE(0,"Can not access format condition!");
+            OSL_FAIL("Can not access format condition!");
         }
 
         impl_conditionCountChanged();
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 09cf0e6eb14d..15b34d1ac91e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -243,7 +243,7 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
             }
             catch(uno::Exception&)
             {
-                OSL_ENSURE(0,"Can not access group!");
+                OSL_FAIL("Can not access group!");
             }
         }
         if ( !vClipboardList.empty() )
@@ -514,7 +514,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow)
         }
         catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"OFieldExpressionControl::SaveModified: Exception caught!");
+            OSL_FAIL("OFieldExpressionControl::SaveModified: Exception caught!");
         }
     }
 
@@ -545,7 +545,7 @@ String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) cons
         }
         catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"Exception caught while getting expression value from the group");
+            OSL_FAIL("Exception caught while getting expression value from the group");
         }
     }
     return sText;
@@ -626,7 +626,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
         }
         catch(uno::Exception&)
         {
-            OSL_ENSURE(0,"Exception cathced while try to get a group!");
+            OSL_FAIL("Exception cathced while try to get a group!");
         }
     }
     return EditBrowseBox::CLEAN;
@@ -1163,7 +1163,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColum
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Eception caught while getting the type of a column");
+        OSL_FAIL("Eception caught while getting the type of a column");
     }
 
     return nDataType;
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index ba82ca8f104b..99142605a24c 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -76,7 +76,7 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
             AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 );
             break;
         default:
-            OSL_ENSURE(0,"Unknown page id");
+            OSL_FAIL("Unknown page id");
     }
 
     SvtCJKOptions aCJKOptions;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index f816433b17f4..a3f2191c33c5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1706,7 +1706,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
 }
 // -----------------------------------------------------------------------------
@@ -1738,7 +1738,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
 }
 // -----------------------------------------------------------------------------
@@ -1856,7 +1856,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
     return bDefaultFunction;
 }
@@ -1896,7 +1896,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
     return bDefaultFunction;
 }
@@ -1987,7 +1987,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx
index 249bac85b1b0..949627285f93 100644
--- a/reportdesign/source/ui/misc/Undo.cxx
+++ b/reportdesign/source/ui/misc/Undo.cxx
@@ -91,7 +91,7 @@ namespace
                 }
                 catch(const uno::Exception&)
                 {
-                    OSL_ENSURE(0,"lcl_insertElements:Exception caught!");
+                    OSL_FAIL("lcl_insertElements:Exception caught!");
                 }
             }
         }
@@ -111,7 +111,7 @@ namespace
                 }
                 catch(const uno::Exception&)
                 {
-                    OSL_ENSURE(0,"lcl_setValues:Exception caught!");
+                    OSL_FAIL("lcl_setValues:Exception caught!");
                 }
             }
         }
@@ -156,7 +156,7 @@ OSectionUndo::~OSectionUndo()
             }
             catch(uno::Exception)
             {
-                OSL_ENSURE(0,"Exception caught!");
+                OSL_FAIL("Exception caught!");
             }
         }
     }
@@ -359,7 +359,7 @@ void OGroupUndo::implReInsert( )
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while undoing remove group");
+        OSL_FAIL("Exception catched while undoing remove group");
     }
 }
 //----------------------------------------------------------------------------
@@ -371,7 +371,7 @@ void OGroupUndo::implReRemove( )
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception catched while redoing remove group");
+        OSL_FAIL("Exception catched while redoing remove group");
     }
 }
 //----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6259f195f4eb..822590c65d44 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -221,7 +221,7 @@ namespace
                         aFontDescriptor.Underline = awt::FontUnderline::SINGLE - aFontDescriptor.Underline;
                         break;
                     default:
-                        OSL_ENSURE(0,"Illegal value in default!");
+                        OSL_FAIL("Illegal value in default!");
                         break;
                 }
 
@@ -358,7 +358,7 @@ void OReportController::disposing()
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception caught while disposing row sets.");
+        OSL_FAIL("Exception caught while disposing row sets.");
     }
     m_xRowSet.clear();
     m_xRowSetMediator.clear();
@@ -2209,7 +2209,7 @@ void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEven
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
-    OSL_ENSURE(0,"Not yet implemented!");
+    OSL_FAIL("Not yet implemented!");
 }
 // -----------------------------------------------------------------------------
 void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index bf34f824f175..2a6b51578245 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -111,7 +111,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
     }
     catch(uno::Exception&)
     {
-        OSL_ENSURE(0,"Exception catched!");
+        OSL_FAIL("Exception catched!");
     }
 
     m_pFunc.reset(new DlgEdFuncSelect( this ));
@@ -315,7 +315,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
                 }
                 catch(uno::Exception&)
                 {
-                    OSL_ENSURE(0,"Exception caught while pasting a new object!");
+                    OSL_FAIL("Exception caught while pasting a new object!");
                 }
                 if ( !_bForce )
                     break;
@@ -391,7 +391,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
             }
             catch(uno::Exception&)
             {
-                OSL_ENSURE(0,"Can't copy report elements!");
+                OSL_FAIL("Can't copy report elements!");
             }
         }
     }
@@ -604,7 +604,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
             }
             catch(uno::Exception)
             {
-                OSL_ENSURE(0,"Exception caught: OReportSection::_propertyChanged(");
+                OSL_FAIL("Exception caught: OReportSection::_propertyChanged(");
             }
 
             Resize();
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 1ca2e5cadbee..d5db6eb1d101 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -101,7 +101,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                 pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2);
                 break;
             default:
-                OSL_ENSURE(0,"Unknown object id");
+                OSL_FAIL("Unknown object id");
                 break;
         }
     }
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index fd4ecfbd5f65..358007d9b87d 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -408,7 +408,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
             }
             else
             {
-                OSL_ENSURE(0,"Unknown service name!");
+                OSL_FAIL("Unknown service name!");
                 nResId = RID_STR_CLASS_FORMATTEDFIELD;
             }