diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/framework/factories/TaskPanelFactory.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 2c6ba75c9af7..62596b7a5f4c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -507,8 +507,8 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) break; default: - OSL_ENSURE( - false, "SdNavigatorWin::ShapeFilterCallback called for unknown menu entry"); + OSL_FAIL( + "SdNavigatorWin::ShapeFilterCallback called for unknown menu entry"); break; } diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 0cfbc942df87..9e0c5ae645ef 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -272,7 +272,7 @@ void SAL_CALL TaskPanelFactory::releaseResource ( } else { - OSL_ENSURE( false, "TaskPanelFactory::releaseResource: don't know what to do with this resource!" ); + OSL_FAIL( "TaskPanelFactory::releaseResource: don't know what to do with this resource!" ); } } } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 311d7eb39827..da603c7d29cd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -970,7 +970,7 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const #ifdef DBG_UTIL if(mbInDestructor) { - OSL_ENSURE(false, "Higher call inside PageObjectViewObjectContact in destructor (!)"); + OSL_FAIL("Higher call inside PageObjectViewObjectContact in destructor (!)"); } #endif diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 00c4f2edfad4..dc34daca9763 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -610,13 +610,13 @@ SdPage* ToolPanelViewShell::getCurrentPage() const // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Execute( SfxRequest& ) { - OSL_ENSURE( false, "ToolPanelViewShell::Execute: not to be called! (right?)" ); + OSL_FAIL( "ToolPanelViewShell::Execute: not to be called! (right?)" ); } // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::GetState( SfxItemSet& ) { - OSL_ENSURE( false, "ToolPanelViewShell::GetState: not to be called! (right?)" ); + OSL_FAIL( "ToolPanelViewShell::GetState: not to be called! (right?)" ); } // --------------------------------------------------------------------------------------------------------------------- diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 1a41057c6434..3ac6a6df82d6 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -303,8 +303,8 @@ void SAL_CALL SdXImpressDocument::release() throw ( ) } catch (uno::RuntimeException const& exc) { // don't break throw () - OSL_ENSURE( - false, OUStringToOString( + OSL_FAIL( + OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); static_cast<void>(exc); } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index fcbfddad198b..f52a3469cb47 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -1199,7 +1199,7 @@ void ViewShell::AdaptDefaultsForChart( } catch( const uno::Exception & ) { - OSL_ENSURE( false, "Exception caught in AdaptDefaultsForChart" ); + OSL_FAIL( "Exception caught in AdaptDefaultsForChart" ); } } } |