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

46 files changed, 104 insertions, 104 deletions

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index eecc21025..8747c1858 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -395,7 +395,7 @@ awt::Point AccessibleBase::GetUpperLeftOnScreen() const
             aResult = pParent->GetUpperLeftOnScreen();
         }
         else
-            OSL_ENSURE( false, "Default position used is probably incorrect." );
+            OSL_FAIL( "Default position used is probably incorrect." );
     }
 
     return aResult;
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index c1b852386..161d2eef8 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -139,49 +139,49 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
 Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessible >();
 }
 
 ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return -1;
 }
 
 ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return AccessibleRole::UNKNOWN;
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleName()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleRelationSet >();
 }
 
 Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleStateSet >();
 }
 
@@ -189,7 +189,7 @@ lang::Locale SAL_CALL AccessibleTextHelper::getLocale()
     throw (IllegalAccessibleComponentStateException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return lang::Locale();
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index b3769769c..957a070b5 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -110,7 +110,7 @@ awt::Point SAL_CALL AreaWrapper::getPosition()
 void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ )
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set position of chart area" );
+    OSL_FAIL( "trying to set position of chart area" );
 }
 
 awt::Size SAL_CALL AreaWrapper::getSize()
@@ -123,7 +123,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of chart area" );
+    OSL_FAIL( "trying to set size of chart area" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
@@ -166,7 +166,7 @@ Reference< beans::XPropertySet > AreaWrapper::getInnerPropertySet()
     Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
     if( xChartDoc.is() )
         return xChartDoc->getPageBackground();
-    OSL_ENSURE(false,"AreaWrapper::getInnerPropertySet() is NULL");
+    OSL_FAIL("AreaWrapper::getInnerPropertySet() is NULL");
     return 0;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 0423efb27..0f429e3d9 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -382,7 +382,7 @@ awt::Point SAL_CALL AxisWrapper::getPosition()
 void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set position of Axis" );
+    OSL_FAIL( "trying to set position of Axis" );
 }
 
 awt::Size SAL_CALL AxisWrapper::getSize()
@@ -396,7 +396,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of Axis" );
+    OSL_FAIL( "trying to set size of Axis" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 6e94705f1..d9ab10cdf 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -563,7 +563,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
         if( aName.indexOf( C2U("Line") ) != -1 || aName.indexOf( C2U("Symbol") ) != -1 )
             return C2U( "com.sun.star.chart.LineDiagram" );
 
-        OSL_ENSURE( false, "unknown template" );
+        OSL_FAIL( "unknown template" );
     }
 
     return OUString();
@@ -1349,7 +1349,7 @@ WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, ::boost:
         m_aOuterName = C2U( "Deep" );
         break;
     default:
-        OSL_ENSURE( false, "unexpected stack mode" );
+        OSL_FAIL( "unexpected stack mode" );
         break;
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 9bda2c545..16aa607fd 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -235,22 +235,22 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rP
 void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XMultiPropertySet
@@ -293,20 +293,20 @@ void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
     const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XPropertyState
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 4a2dec971..9bf7126cc 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -263,7 +263,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of title" );
+    OSL_FAIL( "trying to set size of title" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 3f3c22fe2..9e5afd149 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -207,22 +207,22 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr
 void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XMultiPropertySet
@@ -263,17 +263,17 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
 void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XPropertyState
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 2a72daeeb..8ac6ba6e1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -99,7 +99,7 @@ WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty
             m_aOuterName = C2U("ReverseDirection");
             break;
         default:
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
     }
 }
@@ -300,7 +300,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
         }
         default:
         {
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
         }
     }
@@ -499,7 +499,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
         }
         default:
         {
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
         }
     }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index e8984a0e0..1e336a91a 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -269,7 +269,7 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart
             return (*aIter).first;
     }
 
-    OSL_ENSURE( false, "ChartType not implemented yet - use fallback to similar type" );
+    OSL_FAIL( "ChartType not implemented yet - use fallback to similar type" );
     for( sal_Int32 nMatchPrecision=1; nMatchPrecision<8; nMatchPrecision++ )
     {
         for( aIter = rMap.begin(); aIter != aEnd; ++aIter )
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index c580d322b..3561bea47 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -441,7 +441,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex )
 
         if(nAfterColumnIndex<0)
         {
-            OSL_ENSURE( false, "wrong index for category level insertion" );
+            OSL_FAIL( "wrong index for category level insertion" );
             return;
         }
 
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 4680726ca..73cf05c48 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -689,7 +689,7 @@ bool DialogModel::setData(
     if( ! xDataProvider.is() ||
         ! m_xTemplate.is() )
     {
-        OSL_ENSURE( false, "Model objects missing" );
+        OSL_FAIL( "Model objects missing" );
         return false;
     }
 
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 799b26370..37dfd72e0 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -320,7 +320,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
 uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
     return 0;
 }
 
@@ -404,25 +404,25 @@ void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
         const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1cd110439..da6033582 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -395,7 +395,7 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *,  )
     }
     else
     {
-        OSL_ENSURE( false, "Unknown category chosen" );
+        OSL_FAIL( "Unknown category chosen" );
         m_bErrorKindUnique = false;
     }
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 92eb9710e..a1f62d95c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -317,7 +317,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
             ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
         else
         {
-            OSL_ENSURE( false, "Invalid Entry selected" );
+            OSL_FAIL( "Invalid Entry selected" );
         }
     }
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 5e5fca137..f2f411556 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -204,7 +204,7 @@ namespace
             catch( const uno::Exception & ex )
             {
                 (void)(ex); // no warning in non-debug builds
-                OSL_ENSURE( false, ::rtl::OUStringToOString(
+                OSL_FAIL( ::rtl::OUStringToOString(
                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                                 ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
             }
@@ -236,7 +236,7 @@ namespace
             catch( const uno::Exception & ex )
             {
                 (void)(ex); // no warning in non-debug builds
-                OSL_ENSURE( false, ::rtl::OUStringToOString(
+                OSL_FAIL( ::rtl::OUStringToOString(
                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                                 ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
             }
@@ -255,7 +255,7 @@ namespace
         catch( const uno::Exception & ex )
         {
             (void)(ex); // no warning in non-debug builds
-            OSL_ENSURE( false, ::rtl::OUStringToOString(
+            OSL_FAIL( ::rtl::OUStringToOString(
                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                             ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
         }
@@ -275,7 +275,7 @@ namespace
         catch( const uno::Exception & ex )
         {
             (void)(ex); // no warning in non-debug builds
-            OSL_ENSURE( false, ::rtl::OUStringToOString(
+            OSL_FAIL( ::rtl::OUStringToOString(
                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                             ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
         }
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 236c5d078..90220b7d8 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -246,7 +246,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
             m_xCurrentChartTypeTemplate.set( m_pTemplateProvider->getCurrentTemplate());
         if( !m_xCurrentChartTypeTemplate.is())
         {
-            OSL_ENSURE( false, "Need a template to change data source" );
+            OSL_FAIL( "Need a template to change data source" );
             return;
         }
     }
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 1d98cfecb..9781d249c 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -352,7 +352,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         nIndex = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue());
     else
     {
-        OSL_ENSURE( false, "Using Standard Language" );
+        OSL_FAIL( "Using Standard Language" );
     }
 
     Edit* pEdit = NULL;
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 905bfbf08..805c9f9d1 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -205,7 +205,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
         case SCHATTR_STAT_PERCENT:
         case SCHATTR_STAT_BIGERROR:
         {
-            OSL_ENSURE( false, "Deprectaed item" );
+            OSL_FAIL( "Deprectaed item" );
             uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
 
             double fValue =
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 4d29b74e2..b7231f5fa 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -733,7 +733,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                     else
                     {
-                        OSL_ENSURE( false, "Wrong type in Transparency Any" );
+                        OSL_FAIL( "Wrong type in Transparency Any" );
                     }
                 }
             }
@@ -778,7 +778,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                     else
                     {
-                        OSL_ENSURE( false, "Wrong type in Transparency Any" );
+                        OSL_FAIL( "Wrong type in Transparency Any" );
                     }
                 }
             }
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 2132c66d5..56516875c 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -143,7 +143,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                     catch( beans::UnknownPropertyException &ex )
                     {
                         delete pItem;
-                        OSL_ENSURE( false,
+                        OSL_FAIL(
                                     ::rtl::OUStringToOString(
                                         ex.Message +
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -175,14 +175,14 @@ void ItemConverter::FillSpecialItem(
     USHORT /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
     throw( uno::Exception )
 {
-    OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+    OSL_FAIL( "ItemConverter: Unhandled special item found!" );
 }
 
 bool ItemConverter::ApplySpecialItem(
     USHORT /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
     throw( uno::Exception )
 {
-    OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+    OSL_FAIL( "ItemConverter: Unhandled special item found!" );
     return false;
 }
 
@@ -214,7 +214,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                 }
                 catch( beans::UnknownPropertyException &ex )
                 {
-                    OSL_ENSURE( false,
+                    OSL_FAIL(
                                 ::rtl::OUStringToOString(
                                     ex.Message +
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -223,7 +223,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                 }
                 catch( uno::Exception &ex )
                 {
-                    OSL_ENSURE( false, ::rtl::OUStringToOString(
+                    OSL_FAIL( ::rtl::OUStringToOString(
                                     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
                 }
             }
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 07df2b1f4..fa5a75dfb 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -304,7 +304,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
         case SCHATTR_STAT_PERCENT:
         case SCHATTR_STAT_BIGERROR:
         {
-            OSL_ENSURE( false, "Deprectaed item" );
+            OSL_FAIL( "Deprectaed item" );
             uno::Reference< beans::XPropertySet > xErrorBarProp(
                 lcl_GetYErrorBar( GetPropertySet()));
             bool bOldHasErrorBar = xErrorBarProp.is();
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index a58c53157..4d5ebf9f6 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -690,7 +690,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
     ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand ));
     if( aIt != m_aCommandAvailability.end())
         return aIt->second;
-    OSL_ENSURE( false, "commandAvailable: command not in availability map" );
+    OSL_FAIL( "commandAvailable: command not in availability map" );
     return false;
 }
 
diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx
index 4975c0ad6..07a513318 100644
--- a/chart2/source/controller/main/UndoManager.cxx
+++ b/chart2/source/controller/main/UndoManager.cxx
@@ -204,7 +204,7 @@ void UndoManager::impl_undoRedo(
     }
     else
     {
-        OSL_ENSURE( false, "Can't Undo/Redo" );
+        OSL_FAIL( "Can't Undo/Redo" );
     }
 }
 
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 315b93036..48bd167af 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -38,7 +38,7 @@
 */
 #if OSL_DEBUG_LEVEL > 0
 #define ASSERT_EXCEPTION(ex)                   \
-  OSL_ENSURE( false, ::rtl::OUStringToOString( \
+  OSL_FAIL( ::rtl::OUStringToOString( \
     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +\
     ::rtl::OUString::createFromAscii( typeid( ex ).name()) +\
     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +\
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index f70bd44bc..2ad5dfa98 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -285,7 +285,7 @@ sal_Bool SAL_CALL XMLFilter::filter(
     }
     else
     {
-        OSL_ENSURE( false, "filter() called with no document set" );
+        OSL_FAIL( "filter() called with no document set" );
     }
 
     return bResult;
@@ -346,7 +346,7 @@ sal_Int32 XMLFilter::impl_Import(
         Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
         if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
         {
-            OSL_ENSURE( false, "Import: No ChartDocument" );
+            OSL_FAIL( "Import: No ChartDocument" );
             return ERRCODE_SFX_GENERAL;
         }
 
@@ -604,7 +604,7 @@ sal_Int32 XMLFilter::impl_Export(
         Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
         if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
         {
-            OSL_ENSURE( false, "Export: No ChartDocument" );
+            OSL_FAIL( "Export: No ChartDocument" );
             return ERRCODE_SFX_GENERAL;
         }
 
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index afd8a837a..f68011b64 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -463,7 +463,7 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties
 Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented yet" );
+    OSL_FAIL( "Not implemented yet" );
     return Sequence< Reference< beans::XPropertySet > >();
 }
 
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4d8765eda..2fd73151d 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1034,7 +1034,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
     }
     else
     {
-        OSL_ENSURE( false, "setVisualAreaSize: Aspect not implemented yet.");
+        OSL_FAIL( "setVisualAreaSize: Aspect not implemented yet.");
     }
 }
 
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 7b55b021a..861c25a64 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -374,7 +374,7 @@ void ChartModel::impl_store(
     }
     else
     {
-        OSL_ENSURE( false, "No filter" );
+        OSL_FAIL( "No filter" );
     }
 
     setModified( sal_False );
@@ -605,7 +605,7 @@ void ChartModel::impl_load(
     }
     else
     {
-        OSL_ENSURE( false, "loadFromStorage cannot create filter" );
+        OSL_FAIL( "loadFromStorage cannot create filter" );
     }
     
     if( xStorage.is() )
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index eb58b1c1f..f080aaeb4 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -456,7 +456,7 @@ void SAL_CALL Diagram::addCoordinateSystem(
 
         if( m_aCoordSystems.size()>=1 )
         {
-            OSL_ENSURE( false, "more than one coordinatesystem is not supported yet by the fileformat" );
+            OSL_FAIL( "more than one coordinatesystem is not supported yet by the fileformat" );
             return;
         }
         m_aCoordSystems.push_back( aCoordSys );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 7eef337f8..f4455d68a 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -125,7 +125,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index a1f1d60d2..6e0803732 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -98,7 +98,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index e7280ccda..0c4366979 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -563,7 +563,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA
     throw (uno::Exception,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "createInstanceWithArguments: No arguments supported" );
+    OSL_FAIL( "createInstanceWithArguments: No arguments supported" );
     return createInstance( ServiceSpecifier );
 }
 
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4f1ee786b..0838d65e7 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -423,7 +423,7 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter
     else
     {
         //todo...
-        OSL_ENSURE( false, "number of lines may not be valid anymore in the datainterpreter" );
+        OSL_FAIL( "number of lines may not be valid anymore in the datainterpreter" );
     
     }
 
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 1dcf295b6..20f1de148 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -146,7 +146,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index f2bb0bc4a..38b7916cf 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -169,7 +169,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 5c740edbc..a5870b008 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -360,7 +360,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
     }
     else
     {
-        OSL_ENSURE( false, "unknown charttype" );
+        OSL_FAIL( "unknown charttype" );
     }
 
     return aRet;
@@ -614,7 +614,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
     }
     else
     {
-        OSL_ENSURE( false, "unknown charttype" );
+        OSL_FAIL( "unknown charttype" );
     }
 
     return aRet;
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 0a73dfe5c..c507eea49 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -166,7 +166,7 @@ void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position
 {
     if(nPolygonIndex<0)
     {
-        OSL_ENSURE( false, "The polygon index needs to be > 0");
+        OSL_FAIL( "The polygon index needs to be > 0");
         nPolygonIndex=0;
     }
 
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 46d249b00..6444369e9 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -365,14 +365,14 @@ void SAL_CALL OPropertySet::getFastPropertyValue
                         }
                         else
                         {
-                            OSL_ENSURE( false,  "HandleCheck: Handle not found in Style" );
+                            OSL_FAIL(  "HandleCheck: Handle not found in Style" );
                         }
                     }
                     else
-                        OSL_ENSURE( false, "HandleCheck: Invalid XPropertySetInfo returned" );
+                        OSL_FAIL( "HandleCheck: Invalid XPropertySetInfo returned" );
                 }
                 else
-                    OSL_ENSURE( false, "HandleCheck: XPropertySet not supported" );
+                    OSL_FAIL( "HandleCheck: XPropertySet not supported" );
             }
 #endif
             rValue = xStylePropSet->getFastPropertyValue( nHandle );
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4abbf4698..e06a0ee45 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -76,7 +76,7 @@ OUString lcl_getServiceNameForType( ::chart::RegressionCurveHelper::tRegressionT
             aServiceName = C2U( "com.sun.star.chart2.PotentialRegressionCurve" );
             break;
         default:
-            OSL_ENSURE(false,"unknown regression curve type - use linear instead");
+            OSL_FAIL("unknown regression curve type - use linear instead");
             aServiceName = C2U( "com.sun.star.chart2.LinearRegressionCurve" );
             break;
     }
@@ -372,7 +372,7 @@ void RegressionCurveHelper::addRegressionCurve(
 
     if( eType == REGRESSION_TYPE_NONE )
     {
-        OSL_ENSURE(false,"don't create a regression curve of type none");
+        OSL_FAIL("don't create a regression curve of type none");
         return;
     }
 
@@ -609,7 +609,7 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
     if( aServiceName.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
     {
-        OSL_ENSURE( false, "Meanvalue lines in legend not supported" );
+        OSL_FAIL( "Meanvalue lines in legend not supported" );
         aResult = OUString();
         // aResult = ::chart::SchResId::getResString( STR_OBJECT_AVERAGE_LINE );
     }
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 966bde02b..0467793e2 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -93,7 +93,7 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram(
 
         case TitleHelper::MAIN_TITLE:
         default:
-            OSL_ENSURE( false, "Unsupported Title-Type requested" );
+            OSL_FAIL( "Unsupported Title-Type requested" );
             break;
     }
 
@@ -125,7 +125,7 @@ uno::Reference< XTitled > lcl_getTitleParent( TitleHelper::eTitleType nTitleInde
             xResult.set( lcl_getTitleParentFromDiagram( nTitleIndex, xDiagram ));
             break;
         default:
-            OSL_ENSURE( false, "Unsupported Title-Type requested" );
+            OSL_FAIL( "Unsupported Title-Type requested" );
             break;
     }
 
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index f1010db2c..fad583f8c 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -266,7 +266,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
 ::sal_Int32 SAL_CALL UncachedDataSequence::getCount()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Implement!" );
+    OSL_FAIL( "Implement!" );
     return 0;
 }
 
@@ -275,7 +275,7 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Implement!" );
+    OSL_FAIL( "Implement!" );
     return uno::Any();
 }
 
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index dc4c6893d..eb761a294 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -142,7 +142,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
     }
     catch( uno::Exception& ex )
     {
-        OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+        OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
         aWrappedException.TargetException = uno::makeAny( ex );
         throw aWrappedException;
@@ -183,7 +183,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
     }
     catch( uno::Exception& ex )
     {
-        OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+        OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
         aWrappedException.TargetException = uno::makeAny( ex );
         throw aWrappedException;
@@ -299,19 +299,19 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
 void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 
@@ -466,13 +466,13 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
 
                     if( nHandle == -1 )
                     {
-                        OSL_ENSURE( false, "missing property in property list" );
+                        OSL_FAIL( "missing property in property list" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
                     else if( m_pWrappedPropertyMap->find( nHandle ) != m_pWrappedPropertyMap->end() )
                     {
                         //duplicate Wrapped property
-                        OSL_ENSURE( false, "duplicate Wrapped property" );
+                        OSL_FAIL( "duplicate Wrapped property" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
                     else
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index fc1fddefc..273275438 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -229,7 +229,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
             {
                 //move all existing series in the xSlot to next slot
                 //@todo
-                OSL_ENSURE( false, "Not implemented yet");
+                OSL_FAIL( "Not implemented yet");
             }
             else if( ySlot == -1 || ySlot >= nYSlotCount)
             {
@@ -242,7 +242,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
                 //insert at given y and x position
 
                 //@todo
-                OSL_ENSURE( false, "Not implemented yet");
+                OSL_FAIL( "Not implemented yet");
             }
         }
     }
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 204ba0b43..1b2c86851 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2936,7 +2936,7 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException)
 Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
     return 0;
 }
 
@@ -3012,25 +3012,25 @@ void SAL_CALL ChartView::addPropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL ChartView::removePropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 // ____ XMultiServiceFactory ____
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index e23501e6c..de228846b 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -165,7 +165,7 @@ void lcl_addPointToPoly( drawing::PolyPolygonShape3D& rPoly
 {
     if(nPolygonIndex<0)
     {
-        OSL_ENSURE( false, "The polygon index needs to be > 0");
+        OSL_FAIL( "The polygon index needs to be > 0");
         nPolygonIndex=0;
     }