diff options
55 files changed, 126 insertions, 126 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index ab3ebe750ff7..da0ffe71eca7 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 9fd7695b301a..818a7b90256c 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 82954b939226..66ca1e60fe43 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 5dbefe7cded9..59f0f6f372dd 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 4819f51d1713..d22f5dd6dfeb 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 29a6576b3697..a3e91a89c919 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 0f88ab67e23b..eea3a3eadd50 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 45fb4495344f..e803e0033d51 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 4894d86a0a49..ff5e93c0a497 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 e8984a0e0b4f..1e336a91ab55 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 d092d81d7383..f0d08ea42719 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 8a86162061ae..ad2916e74bbe 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 b7461c404363..ded21367da64 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 1cd110439e7f..da60335824c2 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 ff26d19ea7f0..74ee184fc892 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 dcf70f841db7..47f9e15c1ef6 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 083dd668a1ff..ee2ff7047285 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 195be46fedf6..a71a512e4a27 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 072768c13658..5330cfa66d02 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 dd41bb4af525..91761b8a9337 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 322061b61b06..7e5b9ec9839d 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 409b675e41b9..7efa65b92ea7 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 c2134bef3ff1..eaf4b77a8746 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 2f9efb674eaf..d282201ad63d 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 e1e7a8e22f46..ffa5290483c6 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 d6d826db85ac..c9af823dd9da 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 2920f7316f1a..e9b8c8c37ffe 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 5bb4a5ed27db..8d99d87ce76b 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 a7943bc76cd4..b1cbbd0d3db8 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 00ec27e5ff5e..c9f7b985d625 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 e863bb4d0a53..a81e0508810d 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 547bf3c103f2..c014113cc9f5 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 00ebab147245..ba1fd1cbb13c 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 716fe9dce6c5..2b99f706a696 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 81760c2d3f39..da9ad227b3f8 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 3d7b0fff5f28..260a76cada8b 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 70e70a26127a..a70131d38ae9 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 989b86eedff4..5dae11545d83 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 94fe66a5388f..801fc608e864 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 844b91acd5d5..cd0e04b075a8 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 6cd9585d76af..78809c1ca45a 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 f90feb01bd38..543cdad9b26e 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 ca3dd7227b5b..f57e9e72714c 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 715ed716099e..258b85c82e83 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 826210b9875a..3940e35bf902 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 d13a6fd13faf..64a07de21c13 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; } diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 083044f5e076..bdd8137b4511 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -460,7 +460,7 @@ lcl_refListFormsOneRange( } else { - OSL_ENSURE(false, "lcl_checkRangeDimensions shouldn't allow that!"); + OSL_FAIL( "lcl_checkRangeDimensions shouldn't allow that!"); aWhich = lcl_GetRow; // initialize to avoid warning } // Sort the references by start of range diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 0c75c8eaa9c7..cb55ca2f8870 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -422,7 +422,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); aBuf.append(": "); aBuf.append(nArgs); - OSL_ENSURE(false, aBuf.getStr()); + OSL_FAIL( aBuf.getStr()); nArgs = CommonData::nMaxParams; pRun->aData.bRepeatLast = true; } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index a5f47770e4a2..eef95166839b 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -2277,7 +2277,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet ) } catch( Exception& ) { - OSL_ENSURE( false, "XclExpChLegend::Convert - cannot get legend shape" ); + OSL_FAIL( "XclExpChLegend::Convert - cannot get legend shape" ); maData.mnDockMode = EXC_CHLEGEND_RIGHT; } } @@ -2292,7 +2292,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet ) case cssc2::LegendPosition_PAGE_START: maData.mnDockMode = EXC_CHLEGEND_TOP; break; case cssc2::LegendPosition_PAGE_END: maData.mnDockMode = EXC_CHLEGEND_BOTTOM; break; default: - OSL_ENSURE( false, "XclExpChLegend::Convert - unrecognized legend position" ); + OSL_FAIL( "XclExpChLegend::Convert - unrecognized legend position" ); maData.mnDockMode = EXC_CHLEGEND_RIGHT; } } diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index e26a0b3e630c..d1c5f9c382de 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -251,12 +251,12 @@ void XclExpDffAnchorBase::WriteData( EscherEx& rEscherEx, const Rectangle& rRect void XclExpDffAnchorBase::ImplSetFlags( const SdrObject& ) { - OSL_ENSURE( false, "XclExpDffAnchorBase::ImplSetFlags - not implemented" ); + OSL_FAIL( "XclExpDffAnchorBase::ImplSetFlags - not implemented" ); } void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit ) { - OSL_ENSURE( false, "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); + OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); } // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 5d439a249bc1..c90d6bfb388a 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -159,7 +159,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, } catch( Exception& ) { - OSL_ENSURE( false, "XclRootData::XclRootData - cannot get output device info" ); + OSL_FAIL( "XclRootData::XclRootData - cannot get output device info" ); } } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 796e63f9688d..37c8b0d00c8a 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -394,7 +394,7 @@ void XMLTableStyleContext::SetFormula( uno::Sequence< beans::PropertyValue >& rP lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_GRAMMAR2 ) ), nGrammar ); break; default: - OSL_ENSURE( false, "XMLTableStyleContext::SetFormula - invalid formula index" ); + OSL_FAIL( "XMLTableStyleContext::SetFormula - invalid formula index" ); } } diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 71ba04990861..4d7822bd9279 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -1445,7 +1445,7 @@ void ScDPLayoutDlg::UpdateSrcRange() inSheet.SetRangeName(aSrcStr); break; default: - OSL_ENSURE(false, "Unknown source type."); + OSL_FAIL( "Unknown source type."); return; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 98c21cbf760d..52d7b4977c5f 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2114,7 +2114,7 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -2124,7 +2124,7 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -2134,7 +2134,7 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -2144,7 +2144,7 @@ void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } // DataSource ================================================================ @@ -3387,7 +3387,7 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3398,7 +3398,7 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3409,7 +3409,7 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3420,7 +3420,7 @@ void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } void ScChart2DataSequence::setDataChangedHint(bool b) @@ -3661,7 +3661,7 @@ void SAL_CALL ScChart2EmptyDataSequence::addPropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3672,7 +3672,7 @@ void SAL_CALL ScChart2EmptyDataSequence::removePropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3683,7 +3683,7 @@ void SAL_CALL ScChart2EmptyDataSequence::addVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } @@ -3694,7 +3694,7 @@ void SAL_CALL ScChart2EmptyDataSequence::removeVetoableChangeListener( lang::WrappedTargetException, uno::RuntimeException) { // FIXME: real implementation - OSL_ENSURE( false, "Not yet implemented" ); + OSL_FAIL( "Not yet implemented" ); } #endif diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 101e29bd891d..7b5cce7f8d26 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -470,7 +470,7 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) case sheet::SolverConstraintOperator_GREATER_EQUAL: nConstrType = GE; break; case sheet::SolverConstraintOperator_EQUAL: nConstrType = EQ; break; default: - OSL_ENSURE( false, "unexpected enum type" ); + OSL_FAIL( "unexpected enum type" ); } add_constraint( lp, pValues, nConstrType, fRightValue ); |