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

26 files changed, 66 insertions, 66 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 3c93d42f4f..9eac2207ab 100755
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -302,7 +302,7 @@ void AccessibleControlShape::Init()
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
+        OSL_FAIL( "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
     }
 }
 
@@ -430,7 +430,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent&
 #if OSL_DEBUG_LEVEL > 0
     else
     {
-        OSL_ENSURE( sal_False, "AccessibleControlShape::propertyChange: where did this come from?" );
+        OSL_FAIL( "AccessibleControlShape::propertyChange: where did this come from?" );
     }
 #endif
 }
@@ -531,7 +531,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSour
     }
 #if OSL_DEBUG_LEVEL > 0
     else
-        OSL_ENSURE( sal_False, "AccessibleControlShape::modeChanged: where did this come from?" );
+        OSL_FAIL( "AccessibleControlShape::modeChanged: where did this come from?" );
 #endif
 }
 
@@ -561,12 +561,12 @@ sal_Bool AccessibleControlShape::ensureListeningState(
                 m_xControlModel->removePropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
         }
         else
-            OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
+            OSL_FAIL( "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
     }
     catch( const Exception& e )
     {
         (void)e;    // make compiler happy
-        OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
+        OSL_FAIL( "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
     }
 
     return _bNeedNewListening;
@@ -682,7 +682,7 @@ void SAL_CALL AccessibleControlShape::disposing (void)
     // stop listening at the control container (should never be necessary here, but who knows ....)
     if ( m_bWaitingForControl )
     {
-        OSL_ENSURE( sal_False, "AccessibleControlShape::disposing: this should never happen!" );
+        OSL_FAIL( "AccessibleControlShape::disposing: this should never happen!" );
         Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetWindow(), maShapeTreeInfo.GetSdrView() );
         if ( xContainer.is() )
         {
@@ -732,7 +732,7 @@ sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
     catch( const Exception& e )
     {
         (void)e;    // make compiler happy
-        OSL_ENSURE( sal_False, "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
+        OSL_FAIL( "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
     }
 
     return m_xControlModel.is();
@@ -791,7 +791,7 @@ void AccessibleControlShape::stopStateMultiplexing()
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
+        OSL_FAIL( "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
     }
     return sReturn;
 }
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 4f6805fdf9..fe8faaa163 100755
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -123,7 +123,7 @@ namespace svx
         }
         catch(Exception&)
         {
-            OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !");
+            OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes !");
         }
 
         // If the data source is an SQL-statement and simple enough (means "select <field list> from <table> where ....")
@@ -151,7 +151,7 @@ namespace svx
             }
             catch(Exception&)
             {
-                OSL_ENSURE(sal_False, "OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !");
+                OSL_FAIL("OColumnTransferable::OColumnTransferable: could not collect essential data source attributes (part two) !");
             }
         }
 
@@ -436,7 +436,7 @@ namespace svx
         }
         catch(Exception&)
         {
-            OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !");
+            OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes !");
             return;
         }
 
@@ -450,7 +450,7 @@ namespace svx
         }
         catch(Exception&)
         {
-            OSL_ENSURE(sal_False, "ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !");
+            OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !");
             return;
         }
 
@@ -561,7 +561,7 @@ namespace svx
             return ODataAccessDescriptor(aDescriptorProps);
         }
 
-        OSL_ENSURE( sal_False, "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" );
+        OSL_FAIL( "OColumnTransferable::extractColumnDescriptor: unsupported formats only!" );
         return ODataAccessDescriptor();
     }
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 476e790515..0de0841280 100755
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1539,7 +1539,7 @@ void FmGridControl::RowHeightChanged()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmGridControl::RowHeightChanged: caught an exception!" );
+            OSL_FAIL( "FmGridControl::RowHeightChanged: caught an exception!" );
         }
     }
 }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4a4ea09fd5..9dd9245b36 100755
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -125,13 +125,13 @@ namespace
                 case awt::LineEndFormat::LINE_FEED:                  eFormat = LINEEND_LF; break;
                 case awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED:  eFormat = LINEEND_CRLF; break;
                 default:
-                    OSL_ENSURE( sal_False, "getModelLineEndSetting: what's this?" );
+                    OSL_FAIL( "getModelLineEndSetting: what's this?" );
                 }
             }
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "getModelLineEndSetting: caught an exception!" );
+            OSL_FAIL( "getModelLineEndSetting: caught an exception!" );
         }
         return eFormat;
     }
@@ -1132,7 +1132,7 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "DbTextField::Init: caught an exception while determining the multi-line capabilities!" );
+        OSL_FAIL( "DbTextField::Init: caught an exception while determining the multi-line capabilities!" );
     }
 
     m_bIsSimpleEdit = !bIsMultiLine;
@@ -2942,7 +2942,7 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" );
     (void)_rxModel;
 
-    OSL_ENSURE( sal_False, "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" );
+    OSL_FAIL( "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" );
     // TODO: implement this.
     // remember: updateFromModel should be some kind of opposite of commitControl
 }
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index dd1fca16bc..7b599c8099 100755
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -156,7 +156,7 @@ namespace svx
             xPropInfo = _rxValues->getPropertySetInfo();
         if (!xPropInfo.is())
         {
-            OSL_ENSURE(sal_False, "ODADescriptorImpl::buildFrom: invalid property set!");
+            OSL_FAIL("ODADescriptorImpl::buildFrom: invalid property set!");
             return sal_False;
         }
 
@@ -406,7 +406,7 @@ namespace svx
     {
         if (!has(_eWhich))
         {
-            OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator[]: invalid acessor!");
+            OSL_FAIL("ODataAccessDescriptor::operator[]: invalid acessor!");
             static const Any aDummy;
             return aDummy;
         }
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 5693b175f9..44476bbcd6 100755
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -129,7 +129,7 @@ namespace svxform
 
                 if (NULL == s_pFactoryCreationFunc)
                 {	// did not find the symbol
-                    OSL_ENSURE(sal_False, "ODbtoolsClient::registerClient: could not find the symbol for creating the factory!");
+                    OSL_FAIL("ODbtoolsClient::registerClient: could not find the symbol for creating the factory!");
                     osl_unloadModule(s_hDbtoolsModule);
                     s_hDbtoolsModule = NULL;
                 }
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 16b860402d..1e5fee3a37 100755
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -287,7 +287,7 @@ void FmPropBrw::Resize()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmPropBrw::Resize: caught an exception!" );
+            OSL_FAIL( "FmPropBrw::Resize: caught an exception!" );
         }
     }
 }
@@ -336,7 +336,7 @@ FmPropBrw::~FmPropBrw()
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" );
+        OSL_FAIL( "FmPropBrw::getCurrentPage: caught an exception while retrieving the current page!" );
     }
     return sCurrentPage;
 }
@@ -356,7 +356,7 @@ void FmPropBrw::implDetachController()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmPropBrw::implDetachController: caught an exception while resetting the component!" );
+            OSL_FAIL( "FmPropBrw::implDetachController: caught an exception while resetting the component!" );
         }
     }
 
@@ -383,7 +383,7 @@ sal_Bool FmPropBrw::Close()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmPropBrw::Close: caught an exception while asking the controller!" );
+            OSL_FAIL( "FmPropBrw::Close: caught an exception while asking the controller!" );
         }
     }
 
@@ -445,7 +445,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmPropBrw::implSetNewSelection: caught an unexpected exception!" );
+            OSL_FAIL( "FmPropBrw::implSetNewSelection: caught an unexpected exception!" );
             return;
         }
 
@@ -703,7 +703,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool
                     }
                     catch( const Exception& )
                     {
-                        OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
+                        OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
                     }
                 }
 
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index fbbd9eb15c..ffabe9e557 100755
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -180,7 +180,7 @@ namespace svxform
         if ( _nStatus & CONTROL_STATUS_MOUSE_HOVER )
             return m_nMouseHoveColor;
 
-        OSL_ENSURE( sal_False, "ControlBorderManager::getControlColorByStatus: invalid status!" );
+        OSL_FAIL( "ControlBorderManager::getControlColorByStatus: invalid status!" );
         return 0x00000000;
     }
 
@@ -256,7 +256,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusGained: caught an exception!" );
+            OSL_FAIL( "ControlBorderManager::controlStatusGained: caught an exception!" );
         }
     }
 
@@ -280,7 +280,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ControlBorderManager::controlStatusLost: caught an exception!" );
+            OSL_FAIL( "ControlBorderManager::controlStatusLost: caught an exception!" );
         }
     }
 
@@ -312,7 +312,7 @@ namespace svxform
             m_nInvalidColor = _nColor;
             break;
         default:
-            OSL_ENSURE( sal_False, "ControlBorderManager::setStatusColor: invalid status!" );
+            OSL_FAIL( "ControlBorderManager::setStatusColor: invalid status!" );
         }
     }
 
@@ -432,7 +432,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ControlBorderManager::validityChanged: caught an exception!" );
+            OSL_FAIL( "ControlBorderManager::validityChanged: caught an exception!" );
         }
     }
 
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 3a34a5684e..ec194492ce 100755
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -288,7 +288,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ControlLayouter::initializeControlLayout: caught an exception!" );
+            OSL_FAIL( "ControlLayouter::initializeControlLayout: caught an exception!" );
         }
     }
 
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index dfea91e47a..b634abf7ff 100755
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -175,7 +175,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "DocumentClassification::classifyHostDocument: caught an exception!" );
+            OSL_FAIL( "DocumentClassification::classifyHostDocument: caught an exception!" );
         }
 
         return eType;
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index ab15da6df8..838e0014c1 100755
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -127,7 +127,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel)
         }
         catch( ::com::sun::star::uno::Exception const& )
         {
-            OSL_ENSURE( sal_False, "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" );
+            OSL_FAIL( "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" );
         }
     }
 }
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index c8935b1271..aceeb5033b 100755
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -628,7 +628,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
     catch(const Exception& e)
     {
         (void)e;
-        OSL_ENSURE(sal_False, "FmFormPageImpl::findFormForDataSource: caught an exception!");
+        OSL_FAIL("FmFormPageImpl::findFormForDataSource: caught an exception!");
     }
 
     if (sLookupName == sFormDataSourceName)
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 4598023b34..6dfa437bd5 100755
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -754,7 +754,7 @@ bool FmXFormShell::impl_checkDisposed() const
         m_eDocumentType = DocumentClassification::classifyDocument( xModel );
     else
     {
-        OSL_ENSURE( sal_False, "FmXFormShell::getDocumentType: can't determine the document type!" );
+        OSL_FAIL( "FmXFormShell::getDocumentType: can't determine the document type!" );
         m_eDocumentType = eTextDocument;
             // fallback, just to have a defined state
     }
@@ -1011,7 +1011,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 
     if ( m_nLockSlotInvalidation )
     {
-        OSL_ENSURE( sal_False, "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" );
+        OSL_FAIL( "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" );
         InvalidateSlot( _nId, sal_False );
     }
     else
@@ -1519,7 +1519,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" );
+        OSL_FAIL( "FmXFormShell::ExecuteTabOrderDialog: caught an exception!" );
     }
 }
 
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 1bf8ea49ef..e53bbc3daf 100755
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -66,7 +66,7 @@ namespace svx
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmTextControlFeature::FmTextControlFeature: caught an exception!" );
+            OSL_FAIL( "FmTextControlFeature::FmTextControlFeature: caught an exception!" );
         }
         osl_decrementInterlockedCount( &m_refCount );
     }
@@ -92,7 +92,7 @@ namespace svx
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmTextControlFeature::dispatch: caught an exception!" );
+            OSL_FAIL( "FmTextControlFeature::dispatch: caught an exception!" );
         }
     }
 
@@ -122,7 +122,7 @@ namespace svx
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmTextControlFeature::dispose: caught an exception!" );
+            OSL_FAIL( "FmTextControlFeature::dispose: caught an exception!" );
         }
     }
 
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 0a46606638..0529ac30a9 100755
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -828,7 +828,7 @@ namespace svx
                 }
                 break;
                 default:
-                    OSL_ENSURE( sal_False, "FmTextControlShell::executeClipboardSlot: invalid slot!" );
+                    OSL_FAIL( "FmTextControlShell::executeClipboardSlot: invalid slot!" );
                 }
                 return true;
             }
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 8664d8c4c5..475d31d304 100755
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -166,7 +166,7 @@ void displayException(const Any& _rExcept, Window* _pParent)
     }
     catch(Exception&)
     {
-        OSL_ENSURE(sal_False, "displayException: could not display the error message!");
+        OSL_FAIL("displayException: could not display the error message!");
     }
 }
 
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 67985e8dd5..bddd8ef1b5 100755
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -613,7 +613,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
                 }
                 catch(const Exception&)
                 {
-                    OSL_ENSURE(sal_False, "FmXUndoEnvironment::propertyChange: could not adjust the value property!");
+                    OSL_FAIL("FmXUndoEnvironment::propertyChange: could not adjust the value property!");
                 }
             }
         }
@@ -942,7 +942,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" );
+        OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" );
     }
 }
 
@@ -977,7 +977,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXUndoEnvironment::switchListening: caught an exception!" );
+        OSL_FAIL( "FmXUndoEnvironment::switchListening: caught an exception!" );
     }
 }
 
@@ -1056,7 +1056,7 @@ void FmUndoPropertyAction::Undo()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmUndoPropertyAction::Undo: caught an exception!" );
+            OSL_FAIL( "FmUndoPropertyAction::Undo: caught an exception!" );
         }
         rEnv.UnLock();
     }
@@ -1077,7 +1077,7 @@ void FmUndoPropertyAction::Redo()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmUndoPropertyAction::Redo: caught an exception!" );
+            OSL_FAIL( "FmUndoPropertyAction::Redo: caught an exception!" );
         }
         rEnv.UnLock();
     }
@@ -1239,7 +1239,7 @@ void FmUndoContainerAction::Undo()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmUndoContainerAction::Undo: caught an exception!" );
+            OSL_FAIL( "FmUndoContainerAction::Undo: caught an exception!" );
         }
         rEnv.UnLock();
     }
@@ -1268,7 +1268,7 @@ void FmUndoContainerAction::Redo()
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmUndoContainerAction::Redo: caught an exception!" );
+            OSL_FAIL( "FmUndoContainerAction::Redo: caught an exception!" );
         }
         rEnv.UnLock();
     }
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index bc3080d5cd..406d7177c3 100755
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -232,7 +232,7 @@ namespace svxform
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "lcl_getDataSourceIndirectProperties: caught an exception!" );
+                OSL_FAIL( "lcl_getDataSourceIndirectProperties: caught an exception!" );
             }
             return aInfo;
         }
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index a78ba001b1..40a250aa60 100755
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3659,7 +3659,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo
                     return *pControls;
             }
         }
-        OSL_ENSURE( sal_False, "FormController::locateControl: did not find a control for this model!" );
+        OSL_FAIL( "FormController::locateControl: did not find a control for this model!" );
     }
     catch( const Exception& )
     {
@@ -4220,7 +4220,7 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene
         }
     }
     else
-        OSL_ENSURE(sal_False, "FormController::addStatusListener: invalid (unsupported) URL!");
+        OSL_FAIL("FormController::addStatusListener: invalid (unsupported) URL!");
 }
 
 //------------------------------------------------------------------------------
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index b64ffad561..4c71f9183e 100755
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -125,7 +125,7 @@ namespace svx
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught an exception!" );
+                OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught an exception!" );
             }
         }
         else
@@ -141,12 +141,12 @@ namespace svx
                 }
                 catch( const DisposedException& )
                 {
-                    OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" );
+                    OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a DisposedException - removing the listener!" );
                     aIter.remove( );
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" );
+                    OSL_FAIL( "OSingleFeatureDispatcher::notifyStatus: caught a generic exception while notifying a single listener!" );
                 }
             }
         }
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 6ca8fa78aa..ac1faec8da 100755
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -82,7 +82,7 @@ namespace svxform
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FormToolboxes::toggleToolbox: caught an exception!" );
+            OSL_FAIL( "FormToolboxes::toggleToolbox: caught an exception!" );
         }
     }
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 2e629d7f0e..b5ba3e2d96 100755
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -257,13 +257,13 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
             }
             catch( embed::NoVisualAreaSizeException& )
             {
-                OSL_ENSURE( sal_False, "No visual area size!\n" );
+                OSL_FAIL( "No visual area size!\n" );
                 aSz.Width = 5000;
                 aSz.Height = 5000;
             }
             catch( uno::Exception& )
             {
-                OSL_ENSURE( sal_False, "Unexpected exception!\n" );
+                OSL_FAIL( "Unexpected exception!\n" );
                 aSz.Width = 5000;
                 aSz.Height = 5000;
             }
@@ -290,7 +290,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
         }
         catch( uno::Exception& )
         {
-            OSL_ENSURE( sal_False, "Unexpected exception!\n" );
+            OSL_FAIL( "Unexpected exception!\n" );
         }
     }
 }
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index b112f80efc..5eeda046c6 100755
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -211,7 +211,7 @@ SdrUnoObj::~SdrUnoObj()
     }
     catch( const uno::Exception& )
     {
-        OSL_ENSURE( sal_False, "SdrUnoObj::~SdrUnoObj: caught an exception!" );
+        OSL_FAIL( "SdrUnoObj::~SdrUnoObj: caught an exception!" );
     }
     delete m_pImpl;
 }
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 206903d080..2798bb838c 100755
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -103,7 +103,7 @@ namespace svx
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "ToolboxAccess::toggleToolbox: caught an exception!" );
+            OSL_FAIL( "ToolboxAccess::toggleToolbox: caught an exception!" );
         }
     }
 
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index e131ffc5ad..9a7b17eebb 100755
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -153,7 +153,7 @@ void SAL_CALL RecoveryUI::dispatch(const css::util::URL&
 void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException)
 {
     // TODO
-    OSL_ENSURE(sal_False, "RecoveryUI::addStatusListener()\nNot implemented yet!");
+    OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!");
 }
 
 //===============================================
@@ -161,7 +161,7 @@ void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::f
     throw(css::uno::RuntimeException)
 {
     // TODO
-    OSL_ENSURE(sal_False, "RecoveryUI::removeStatusListener()\nNot implemented yet!");
+    OSL_FAIL("RecoveryUI::removeStatusListener()\nNot implemented yet!");
 }
 
 //===============================================
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 3971324dbc..86b9ef27e5 100755
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -167,7 +167,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
                 }
                 catch( uno::Exception& )
                 {
-                    OSL_ENSURE( sal_False, "Couldn't set the visual area for the object!\n" );
+                    OSL_FAIL( "Couldn't set the visual area for the object!\n" );
                 }
             }