diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:41:23 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:13:33 +0100 |
| commit | c64a901829e5dedf12422edfb6bb7bc94a8357a5 (patch) | |
| tree | 29de7e95e46da1149ca8ac24022cd25b4dcefad3 /slideshow/source/engine/activities | |
| parent | 2c5e690eb8b6aaaad0a1c57fc533e23e4164b8f0 (diff) | |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'slideshow/source/engine/activities')
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 7 | ||||
| -rw-r--r-- | slideshow/source/engine/activities/interpolation.hxx | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 9308d0b80217..c29a385855ce 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -661,8 +661,7 @@ AnimationActivitySharedPtr createActivity( catch( ParseError& ) { // parse error, thus no formula - OSL_ENSURE( false, - "createActivity(): Error parsing formula string" ); + OSL_FAIL( "createActivity(): Error parsing formula string" ); } } @@ -728,7 +727,7 @@ AnimationActivitySharedPtr createActivity( } default: - OSL_ENSURE( false, "createActivity(): unexpected case" ); + OSL_FAIL( "createActivity(): unexpected case" ); // FALLTHROUGH intended case animations::AnimationCalcMode::PACED: // FALLTHROUGH intended @@ -796,7 +795,7 @@ AnimationActivitySharedPtr createActivity( } default: - OSL_ENSURE( false, "createActivity(): unexpected case" ); + OSL_FAIL( "createActivity(): unexpected case" ); // FALLTHROUGH intended case animations::AnimationCalcMode::PACED: // FALLTHROUGH intended diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index 12fa27ffb1ea..a8baa1e3832c 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -56,8 +56,7 @@ namespace basegfx const sal_Int16& rTo, double ) { - OSL_ENSURE( false, - "lerp<sal_Int16> called" ); + OSL_FAIL( "lerp<sal_Int16> called" ); return rTo; } @@ -66,8 +65,7 @@ namespace basegfx const ::rtl::OUString& rTo, double ) { - OSL_ENSURE( false, - "lerp<::rtl::OUString> called" ); + OSL_FAIL( "lerp<::rtl::OUString> called" ); return rTo; } @@ -76,8 +74,7 @@ namespace basegfx const bool& rTo, double ) { - OSL_ENSURE( false, - "lerp<bool> called" ); + OSL_FAIL( "lerp<bool> called" ); return rTo; } } |