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

30 files changed, 68 insertions, 68 deletions

diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index b270e12bd..a944de753 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -394,7 +394,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
+        OSL_FAIL( "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
     }
 
     // Version
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index f92b13fe2..88e66a993 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2082,7 +2082,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
                 }
                 catch(const Exception&)
                 {
-                    OSL_ENSURE(sal_False, "ODatabaseForm::reset_impl: could not initialize the master-detail-driven parameters!");
+                    OSL_FAIL("ODatabaseForm::reset_impl: could not initialize the master-detail-driven parameters!");
                 }
             }
         }
@@ -2542,7 +2542,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
         {
             // can't throw an exception other than a RuntimeException (which would not be appropriate),
             // so we ignore (and only assert) this
-            OSL_ENSURE( sal_False, "ODatabaseForm::setGroup: invalid arguments!" );
+            OSL_FAIL( "ODatabaseForm::setGroup: invalid arguments!" );
             continue;
         }
 
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 7a935862c..decd3a23c 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -119,7 +119,7 @@ ODateModel::ODateModel(const Reference<XMultiServiceFactory>& _rxFactory)
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "ODateModel::ODateModel: caught an exception!" );
+        OSL_FAIL( "ODateModel::ODateModel: caught an exception!" );
     }
     osl_decrementInterlockedCount( &m_refCount );
 }
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index df255735c..1c3a2d374 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -459,7 +459,7 @@ namespace
 
             if ( !xSourceInfo.is() || !xDestInfo.is() )
             {
-                OSL_ENSURE( sal_False, "lcl_transferProperties: invalid property set(s)!" );
+                OSL_FAIL( "lcl_transferProperties: invalid property set(s)!" );
                 return;
             }
 
@@ -496,7 +496,7 @@ namespace
                         sMessage += ::rtl::OString( "\n\nMessage:\n" );
                         sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
                     }
-                    OSL_ENSURE( sal_False, sMessage.getStr() );
+                    OSL_FAIL( sMessage.getStr() );
 #endif
                 }
 
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 115254137..dd4ded84f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -120,13 +120,13 @@ namespace frm
     {
         if ( !m_xField.is() )
         {
-            OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: improperly initialized: no field!" );
+            OSL_FAIL( "OFilterControl::ensureInitialized: improperly initialized: no field!" );
             return sal_False;
         }
 
         if ( !m_xConnection.is() )
         {
-            OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: improperly initialized: no connection!" );
+            OSL_FAIL( "OFilterControl::ensureInitialized: improperly initialized: no connection!" );
             return sal_False;
         }
 
@@ -144,7 +144,7 @@ namespace frm
         }
         if ( !m_xFormatter.is() )
         {
-            OSL_ENSURE( sal_False, "OFilterControl::ensureInitialized: no number formatter!" );
+            OSL_FAIL( "OFilterControl::ensureInitialized: no number formatter!" );
             // no fallback anymore
             return sal_False;
         }
@@ -806,7 +806,7 @@ namespace frm
                 Reference< XPropertySet > xControlModel;
                 if ( !(*pValue >>= xControlModel ) || !xControlModel.is() )
                 {
-                    OSL_ENSURE( sal_False, "OFilterControl::initialize: invalid control model argument!" );
+                    OSL_FAIL( "OFilterControl::initialize: invalid control model argument!" );
                     continue;
                 }
 
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 651d8a6f5..d57723920 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -564,7 +564,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
     }
     catch(const Exception&)
     {
-        OSL_ENSURE(sal_False, "OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
+        OSL_FAIL("OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
     }
 }
 
@@ -579,7 +579,7 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
     }
     catch(const Exception&)
     {
-        OSL_ENSURE(sal_False, "OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
+        OSL_FAIL("OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
     }
     ::comphelper::operator<<( _rxOutStream, sHelpText);
 }
@@ -619,7 +619,7 @@ OControlModel::OControlModel(
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "OControlModel::OControlModel: caught an exception!" );
+                    OSL_FAIL( "OControlModel::OControlModel: caught an exception!" );
                 }
             }
         }
@@ -1966,7 +1966,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!" );
+            OSL_FAIL( "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!" );
         }
     }
 }
@@ -2132,7 +2132,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
                 }
                 else
                 {
-                    OSL_ENSURE(sal_False, "OBoundControlModel::connectToField: property NAME not supported!");
+                    OSL_FAIL("OBoundControlModel::connectToField: property NAME not supported!");
                     impl_setField_noNotify( NULL );
                 }
             }
@@ -2341,7 +2341,7 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::doSetControlValue: caught an exception!" );
+        OSL_FAIL( "OBoundControlModel::doSetControlValue: caught an exception!" );
     }
 }
 
@@ -2361,7 +2361,7 @@ void OBoundControlModel::onConnectedValidator( )
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::onConnectedValidator: caught an exception!" );
+        OSL_FAIL( "OBoundControlModel::onConnectedValidator: caught an exception!" );
     }
     recheckValidity( false );
 }
@@ -2379,7 +2379,7 @@ void OBoundControlModel::onDisconnectedValidator( )
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::onDisconnectedValidator: caught an exception!" );
+        OSL_FAIL( "OBoundControlModel::onDisconnectedValidator: caught an exception!" );
     }
     recheckValidity( false );
 }
@@ -2467,7 +2467,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
     }
     catch( const SQLException& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::reset: caught an SQL exception!" );
+        OSL_FAIL( "OBoundControlModel::reset: caught an SQL exception!" );
     }
     // #i24495# - don't count the insert row as "invalid"
 
@@ -2676,7 +2676,7 @@ void OBoundControlModel::disconnectExternalValueBinding( )
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::disconnectExternalValueBinding: caught an exception!" );
+        OSL_FAIL( "OBoundControlModel::disconnectExternalValueBinding: caught an exception!" );
     }
 
     // if the binding also acts as our validator, disconnect the validator, too
@@ -3045,7 +3045,7 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "OBoundControlModel::recheckValidity: caught an exception!" );
+        OSL_FAIL( "OBoundControlModel::recheckValidity: caught an exception!" );
     }
 }
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 8d0e67af3..b997c19f9 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -546,7 +546,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
+            OSL_FAIL( "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
         }
 
         // Version
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index f1ab69e78..249094849 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -439,7 +439,7 @@ namespace frm
         }
         catch( const Exception& e )
         {
-            OSL_ENSURE( sal_False, "OClickableImageBaseControl::implSubmit: caught an unknown exception!" );
+            OSL_FAIL( "OClickableImageBaseControl::implSubmit: caught an unknown exception!" );
             throw WrappedTargetException( ::rtl::OUString(), *this, makeAny( e ) );
         }
     }
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index a7dfd69c1..7a1919024 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -123,7 +123,7 @@ namespace frm
                 break;
 
             default:
-                OSL_ENSURE( sal_False, "lcl_extractFontDescriptorAggregate: invalid handle!" );
+                OSL_FAIL( "lcl_extractFontDescriptorAggregate: invalid handle!" );
                 break;
             }
             return aValue;
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index b3579a779..6928e1c8c 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -267,7 +267,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OReferenceValueComponent::translateControlValueToExternalValue: caught an exception!" );
+            OSL_FAIL( "OReferenceValueComponent::translateControlValueToExternalValue: caught an exception!" );
         }
 
         return aExternalValue;
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 13c509859..d2b5c5d06 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -98,7 +98,7 @@ namespace frm
             aExternalDoubleValue <<= (double)nScrollValue;
         else
         {
-            OSL_ENSURE( sal_False, "translateControlIntToExternalDoubleValue: no integer scroll value!" );
+            OSL_FAIL( "translateControlIntToExternalDoubleValue: no integer scroll value!" );
             // aExternalDoubleValue is void here, which is okay for this purpose ...
         }
 
@@ -231,14 +231,14 @@ namespace frm
     //------------------------------------------------------------------------------
     Any OScrollBarModel::translateDbColumnToControlValue( )
     {
-        OSL_ENSURE( sal_False, "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
+        OSL_FAIL( "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return Any();
     }
 
     //------------------------------------------------------------------------------
     sal_Bool OScrollBarModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     {
-        OSL_ENSURE( sal_False, "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
+        OSL_FAIL( "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return sal_True;
     }
 
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 9d3232022..7fbc3ea8b 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -187,14 +187,14 @@ namespace frm
     //------------------------------------------------------------------------------
     Any OSpinButtonModel::translateDbColumnToControlValue( )
     {
-        OSL_ENSURE( sal_False, "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
+        OSL_FAIL( "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return Any();
     }
 
     //------------------------------------------------------------------------------
     sal_Bool OSpinButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     {
-        OSL_ENSURE( sal_False, "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
+        OSL_FAIL( "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return sal_True;
     }
 
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 595169752..d6ce99031 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -81,7 +81,7 @@ namespace frm
                 return s_aSystem;
         }
 
-        OSL_ENSURE(sal_False, "getLocale: invalid enum value!");
+        OSL_FAIL("getLocale: invalid enum value!");
         return s_aSystem;
     }
 
@@ -135,7 +135,7 @@ namespace frm
             }
         }
 
-        OSL_ENSURE(sal_False, "lcl_getFormatTable: invalid id!");
+        OSL_FAIL("lcl_getFormatTable: invalid id!");
         return NULL;
     }
 
@@ -199,7 +199,7 @@ namespace frm
                             }
                             catch(const Exception&)
                             {
-                                OSL_ENSURE(sal_False, "OLimitedFormats::ensureTableInitialized: adding the key to the formats collection failed!");
+                                OSL_FAIL("OLimitedFormats::ensureTableInitialized: adding the key to the formats collection failed!");
                             }
 #endif
                         }
@@ -243,7 +243,7 @@ namespace frm
             }
             catch(const Exception&)
             {
-                OSL_ENSURE(sal_False, "OLimitedFormats::setAggregateSet: invalid handle!");
+                OSL_FAIL("OLimitedFormats::setAggregateSet: invalid handle!");
             }
         }
 #endif
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index 641be686b..316bb1056 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -60,7 +60,7 @@ namespace frm
             _rxListener->resetted( _rEvent );
             break;
         default:
-            OSL_ENSURE( sal_False, "ResetListeners::implNotify: invalid notification type!" );
+            OSL_FAIL( "ResetListeners::implNotify: invalid notification type!" );
         }
         return true;
     }
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 174b97585..4bca9d792 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -148,7 +148,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "ORichTextFeatureDispatcher::doNotify: caught an exception!" );
+                OSL_FAIL( "ORichTextFeatureDispatcher::doNotify: caught an exception!" );
             }
         }
     }
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index cbf639155..505420dda 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -701,7 +701,7 @@ namespace frm
         Reference< XDispatch > xReturn;
         if ( !GetWindow() )
         {
-            OSL_ENSURE( sal_False, "ORichTextPeer::queryDispatch: already disposed?" );
+            OSL_FAIL( "ORichTextPeer::queryDispatch: already disposed?" );
             return xReturn;
         }
 
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index af5aaa81d..a900c8ace 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -176,7 +176,7 @@ namespace frm
         StateCache::const_iterator aCachedStatePos = m_aLastKnownStates.find( _nAttributeId );
         if ( aCachedStatePos == m_aLastKnownStates.end() )
         {
-            OSL_ENSURE( sal_False, "RichTextControlImpl::getAttributeState: Don't ask for the state of an attribute which I never encountered!" );
+            OSL_FAIL( "RichTextControlImpl::getAttributeState: Don't ask for the state of an attribute which I never encountered!" );
             return AttributeState( eIndetermined );
         }
         return aCachedStatePos->second;
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index f582b065b..4b3c5b758 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -549,7 +549,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "ORichTextModel::getEditEngine: caught an exception!" );
+                OSL_FAIL( "ORichTextModel::getEditEngine: caught an exception!" );
             }
         }
         return pEngine;
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index a332ae008..7e0261a14 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -105,7 +105,7 @@ namespace frm
         SfxItemSet aToApplyAttributes( getView().GetEmptyItemSet() );
         if ( !m_pImpl->executeAttribute( getView().GetAttribs(), aToApplyAttributes, _nAttributeId, _pArgument, m_pImpl->getSelectedScriptType() ) )
         {
-            OSL_ENSURE( sal_False, "RichTextControl::executeAttribute: cannot handle the given attribute!" );
+            OSL_FAIL( "RichTextControl::executeAttribute: cannot handle the given attribute!" );
             return;
         }
 
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index a5643ef56..105f4fb28 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -112,7 +112,7 @@ namespace frm
     //--------------------------------------------------------------------
     AttributeCheckState AttributeHandler::implGetCheckState( const SfxPoolItem& /*_rItem*/ ) const
     {
-        OSL_ENSURE( sal_False, "AttributeHandler::implGetCheckState: not to be called!" );
+        OSL_FAIL( "AttributeHandler::implGetCheckState: not to be called!" );
         return eIndetermined;
     }
 
@@ -231,7 +231,7 @@ namespace frm
             case SID_ATTR_PARA_ADJUST_RIGHT : m_eAdjust = SVX_ADJUST_RIGHT;   break;
             case SID_ATTR_PARA_ADJUST_BLOCK : m_eAdjust = SVX_ADJUST_BLOCK;   break;
             default:
-                OSL_ENSURE( sal_False, "ParaAlignmentHandler::ParaAlignmentHandler: invalid slot!" );
+                OSL_FAIL( "ParaAlignmentHandler::ParaAlignmentHandler: invalid slot!" );
                 break;
         }
     }
@@ -266,7 +266,7 @@ namespace frm
             case SID_ATTR_PARA_LINESPACE_15: m_nLineSpace = 150; break;
             case SID_ATTR_PARA_LINESPACE_20: m_nLineSpace = 200; break;
             default:
-                OSL_ENSURE( sal_False, "LineSpacingHandler::LineSpacingHandler: invalid slot!" );
+                OSL_FAIL( "LineSpacingHandler::LineSpacingHandler: invalid slot!" );
                 break;
         }
     }
@@ -308,7 +308,7 @@ namespace frm
             case SID_SET_SUPER_SCRIPT   : m_eEscapement = SVX_ESCAPEMENT_SUPERSCRIPT; break;
             case SID_SET_SUB_SCRIPT     : m_eEscapement = SVX_ESCAPEMENT_SUBSCRIPT;   break;
             default:
-                OSL_ENSURE( sal_False, "EscapementHandler::EscapementHandler: invalid slot!" );
+                OSL_FAIL( "EscapementHandler::EscapementHandler: invalid slot!" );
                 break;
         }
     }
@@ -372,7 +372,7 @@ namespace frm
             DELETEZ( pCorrectWich );
         }
         else
-            OSL_ENSURE( sal_False, "SlotHandler::executeAttribute: need attributes to do something!" );
+            OSL_FAIL( "SlotHandler::executeAttribute: need attributes to do something!" );
     }
 
     //====================================================================
@@ -461,7 +461,7 @@ namespace frm
             case SID_ATTR_PARA_LEFT_TO_RIGHT: m_eParagraphDirection = FRMDIR_HORI_LEFT_TOP; m_eDefaultAdjustment = SVX_ADJUST_LEFT; break;
             case SID_ATTR_PARA_RIGHT_TO_LEFT: m_eParagraphDirection = FRMDIR_HORI_RIGHT_TOP; m_eDefaultAdjustment = SVX_ADJUST_RIGHT; break;
             default:
-                OSL_ENSURE( sal_False, "ParagraphDirectionHandler::ParagraphDirectionHandler: invalid attribute id!" );
+                OSL_FAIL( "ParagraphDirectionHandler::ParagraphDirectionHandler: invalid attribute id!" );
         }
 
         if ( SVX_ADJUST_RIGHT == m_eDefaultAdjustment )
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index 411f22cdc..f0eaa1842 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -189,7 +189,7 @@ namespace frm
             return new SfxBoolItem( (WhichId)m_nAttributeId, bEnable );
         }
 
-        OSL_ENSURE( sal_False, "OAsianFontLayoutDispatcher::convertDispatchArgsToItem: did not find the one and only argument!" );
+        OSL_FAIL( "OAsianFontLayoutDispatcher::convertDispatchArgsToItem: did not find the one and only argument!" );
         return NULL;
     }
 
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 10bc7ae4a..eb0f83902 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -422,13 +422,13 @@ namespace frm
             break;
 
             default:
-                OSL_ENSURE( sal_False, "FormOperations::getState: unknown feature id!" );
+                OSL_FAIL( "FormOperations::getState: unknown feature id!" );
                 break;
             }
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FormOperations::getState: caught an exception!" );
+            OSL_FAIL( "FormOperations::getState: caught an exception!" );
         }
 
         return aState;
@@ -983,7 +983,7 @@ namespace frm
             }
             catch( Exception& )
             {
-                OSL_ENSURE( sal_False, "FormOperations::propertyChange: caught an exception while updating the parser!" );
+                OSL_FAIL( "FormOperations::propertyChange: caught an exception while updating the parser!" );
             }
             impl_invalidateAllSupportedFeatures_nothrow( aGuard );
         }
@@ -1181,7 +1181,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FormOperations::impl_ensureInitializedParser_nothrow: caught an exception!" );
+            OSL_FAIL( "FormOperations::impl_ensureInitializedParser_nothrow: caught an exception!" );
         }
 
         m_bInitializedParser = true;
@@ -1210,7 +1210,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FormOperations::impl_disposeParser_nothrow: caught an exception!" );
+            OSL_FAIL( "FormOperations::impl_disposeParser_nothrow: caught an exception!" );
         }
     }
 
@@ -1518,7 +1518,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "FormOperations::impl_executeAutoSort_throw: caught an exception while setting the parser properties!" );
+                OSL_FAIL( "FormOperations::impl_executeAutoSort_throw: caught an exception while setting the parser properties!" );
             }
 
 
@@ -1532,7 +1532,7 @@ namespace frm
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "FormOperations::impl_executeAutoSort_throw: could not reset the form to it's original state!" );
+                    OSL_FAIL( "FormOperations::impl_executeAutoSort_throw: could not reset the form to it's original state!" );
                 }
 
             }
@@ -1591,7 +1591,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_ENSURE( sal_False, "FormOperations::impl_executeAutoFilter_throw: caught an exception while setting the parser properties!" );
+                OSL_FAIL( "FormOperations::impl_executeAutoFilter_throw: caught an exception while setting the parser properties!" );
             }
 
 
@@ -1606,7 +1606,7 @@ namespace frm
                 }
                 catch( const Exception& )
                 {
-                    OSL_ENSURE( sal_False, "FormOperations::impl_executeAutoFilter_throw: could not reset the form to it's original state!" );
+                    OSL_FAIL( "FormOperations::impl_executeAutoFilter_throw: could not reset the form to it's original state!" );
                 }
 
             }
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index f87cd2c9d..5112bb442 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -466,7 +466,7 @@ namespace frm
         }
         break;
         default:
-            OSL_ENSURE( sal_False, "NavigationToolBar::ShowFunctionGroup: invalid group id!" );
+            OSL_FAIL( "NavigationToolBar::ShowFunctionGroup: invalid group id!" );
         }
 
         if ( pGroupIds )
@@ -485,7 +485,7 @@ namespace frm
         case eRecordActions : nIndicatorItem = FormFeature::SaveRecordChanges;  break;
         case eFilterSort    : nIndicatorItem = FormFeature::SortAscending;       break;
         default:
-            OSL_ENSURE( sal_False, "NavigationToolBar::IsFunctionGroupVisible: invalid group id!" );
+            OSL_FAIL( "NavigationToolBar::IsFunctionGroupVisible: invalid group id!" );
         }
 
         return m_pToolbar->IsItemVisible( nIndicatorItem );
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 672843d7f..065f097f1 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -565,7 +565,7 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
     switch( _nWhitespaceTreatment )
     {
     default:
-        OSL_ENSURE( sal_False, "Convert::convertWhitespace: invalid whitespace treatment constant!" );
+        OSL_FAIL( "Convert::convertWhitespace: invalid whitespace treatment constant!" );
         // NO break
     case com::sun::star::xsd::WhiteSpaceTreatment::Preserve:
         sConverted = _rString;
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 265fdb833..d94097a62 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -336,7 +336,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
             new CSubmissionGet( getAction(), aFragment));
     else
     {
-        OSL_ENSURE(sal_False, "Unsupported xforms submission method");
+        OSL_FAIL("Unsupported xforms submission method");
         return false;
     }
 
@@ -570,7 +570,7 @@ void SAL_CALL Submission::submitWithInteraction(
     }
     catch( const VetoException& )
     {
-        OSL_ENSURE( sal_False, "Model::submit: Hmm. How can a single submission have a veto right?" );
+        OSL_FAIL( "Model::submit: Hmm. How can a single submission have a veto right?" );
         // allowed to leave
         throw;
     }
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index dc0f0d051..07794a412 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -112,7 +112,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
     } catch (Exception& e) {
         ::rtl::OString aMsg("Exception during replace:\n");
         aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-        OSL_ENSURE(sal_False, aMsg.getStr());
+        OSL_FAIL(aMsg.getStr());
     }
     return CSubmission::UNKNOWN_ERROR;
 }
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index 38a67c7dd..586a763ee 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -91,7 +91,7 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X
     } else {
         // can't get tunnel to native backend
         // logic for generic implementation could be implemented here...
-        OSL_ENSURE(sal_False, "unkown dom implementation, cannot serialize");
+        OSL_FAIL("unkown dom implementation, cannot serialize");
         return;
     }
 }
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 1b7c4d9e2..55bf875f1 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -107,12 +107,12 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
         try {
             m_aResultStream = aContent.openStream();
         } catch (Exception&) {
-            OSL_ENSURE(sal_False, "Cannot open reply stream from content");
+            OSL_FAIL("Cannot open reply stream from content");
         }
     } catch (Exception&)
     {
         // XXX
-        OSL_ENSURE(sal_False, "Exception during UCB operatration.");
+        OSL_FAIL("Exception during UCB operatration.");
         return UNKNOWN_ERROR;
     }
 
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index 4965809a2..da353c832 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -81,11 +81,11 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
         try {
             m_aResultStream = aSink->getInputStream();
         } catch (Exception&) {
-            OSL_ENSURE(sal_False, "Cannot open reply stream from content");
+            OSL_FAIL("Cannot open reply stream from content");
         }
     } catch (Exception&)
     {
-        OSL_ENSURE(sal_False, "Exception during UCB operatration.");
+        OSL_FAIL("Exception during UCB operatration.");
         return UNKNOWN_ERROR;
     }
     
diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index c4fbeb2d3..7a59063cf 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -72,7 +72,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference<
     } catch (Exception&)
     {
         // XXX
-        OSL_ENSURE(sal_False, "Exception during UCB operatration.");
+        OSL_FAIL("Exception during UCB operatration.");
         return UNKNOWN_ERROR;
     }