summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 11:41:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:13:33 +0100
commitc64a901829e5dedf12422edfb6bb7bc94a8357a5 (patch)
tree29de7e95e46da1149ca8ac24022cd25b4dcefad3 /sd/source
parent2c5e690eb8b6aaaad0a1c57fc533e23e4164b8f0 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/view/viewshe2.cxx2
8 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e225235a9092..15ff806d8791 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -239,7 +239,7 @@ void SdPage::EnsureMasterPageDefaultBackground()
else
{
// no style found, assert and set at least XFILL_NONE
- OSL_ENSURE(false, "No Style for MasterPageBackground fill found (!)");
+ OSL_FAIL("No Style for MasterPageBackground fill found (!)");
getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
}
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index c921786753c6..b949444042a3 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -777,8 +777,8 @@ void SAL_CALL SdStyleSheet::release( ) throw ()
}
catch (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/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" );
}
}
}