From c64a901829e5dedf12422edfb6bb7bc94a8357a5 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 12 Mar 2011 11:41:23 +0100 Subject: Move OSL_ENSURE(false,...) to OSL_FAIL(...) --- .../source/engine/activities/activitiesfactory.cxx | 7 ++--- .../source/engine/activities/interpolation.hxx | 9 ++---- slideshow/source/engine/activitiesqueue.cxx | 5 ++-- slideshow/source/engine/animationfactory.cxx | 8 +++--- .../engine/animationnodes/animationbasenode.cxx | 2 +- .../engine/animationnodes/animationnodefactory.cxx | 9 +++--- .../engine/animationnodes/basecontainernode.cxx | 2 +- .../source/engine/animationnodes/basenode.cxx | 8 +++--- .../source/engine/animationnodes/generateevent.cxx | 28 +++++++++--------- .../animationnodes/sequentialtimecontainer.cxx | 4 +-- slideshow/source/engine/eventmultiplexer.cxx | 2 +- slideshow/source/engine/eventqueue.cxx | 5 ++-- .../source/engine/rehearsetimingsactivity.cxx | 2 +- .../source/engine/shapes/drawinglayeranimation.cxx | 3 +- slideshow/source/engine/shapes/drawshape.cxx | 8 +++--- .../source/engine/shapes/drawshapesubsetting.cxx | 3 +- .../source/engine/shapes/externalshapebase.cxx | 2 +- slideshow/source/engine/shapes/shapeimporter.cxx | 6 ++-- slideshow/source/engine/shapes/viewappletshape.cxx | 2 +- .../source/engine/shapes/viewbackgroundshape.cxx | 3 +- slideshow/source/engine/shapes/viewmediashape.cxx | 11 +++----- slideshow/source/engine/shapesubset.cxx | 2 +- slideshow/source/engine/slide/layermanager.cxx | 15 ++++------ slideshow/source/engine/slide/slideanimations.cxx | 2 +- slideshow/source/engine/slide/slideimpl.cxx | 33 ++++++++-------------- slideshow/source/engine/slide/userpaintoverlay.cxx | 2 +- slideshow/source/engine/slidebitmap.cxx | 3 +- slideshow/source/engine/slideshowimpl.cxx | 9 +++--- slideshow/source/engine/slideview.cxx | 12 +++----- slideshow/source/engine/smilfunctionparser.cxx | 3 +- slideshow/source/engine/soundplayer.cxx | 2 +- .../engine/transitions/shapetransitionfactory.cxx | 8 ++---- .../engine/transitions/slidetransitionfactory.cxx | 12 +++----- slideshow/source/engine/usereventqueue.cxx | 2 +- slideshow/source/engine/waitsymbol.cxx | 3 +- 35 files changed, 97 insertions(+), 140 deletions(-) (limited to 'slideshow/source/engine') 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 called" ); + OSL_FAIL( "lerp 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 called" ); + OSL_FAIL( "lerp called" ); return rTo; } } diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 673c029e2cbc..cc7b738d0756 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -73,7 +73,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -141,8 +141,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 890b42df76ae..b5fda4da99d3 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -693,7 +693,7 @@ namespace slideshow if( !rAny.hasValue() ) { - OSL_ENSURE( false, "getDefault(): cannot get requested shape property" ); + OSL_FAIL( "getDefault(): cannot get requested shape property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape property", ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); @@ -705,7 +705,7 @@ namespace slideshow if( !(rAny >>= aValue) ) { - OSL_ENSURE( false, "getDefault(): cannot extract requested shape property" ); + OSL_FAIL( "getDefault(): cannot extract requested shape property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape property", ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); @@ -724,7 +724,7 @@ namespace slideshow if( !rAny.hasValue() ) { - OSL_ENSURE( false, "getDefault(): cannot get requested shape color property" ); + OSL_FAIL( "getDefault(): cannot get requested shape color property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape color property", ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); @@ -736,7 +736,7 @@ namespace slideshow if( !(rAny >>= nValue) ) { - OSL_ENSURE( false, "getDefault(): cannot extract requested shape color property" ); + OSL_FAIL( "getDefault(): cannot extract requested shape color property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape color property", ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 9125cc6bcac5..22c4266ee00c 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -217,7 +217,7 @@ bool AnimationBaseNode::init_st() mpActivity = createActivity(); } catch (uno::Exception const&) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8 ) ); // catch and ignore. We later handle empty activities, but for diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index c4a205cf6588..f4ab9343087e 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -371,8 +371,7 @@ bool implCreateIteratedNodes( { // will not animate the whole paragraph, when // only the paragraph is animated at all. - OSL_ENSURE( false, - "implCreateIteratedNodes(): Ignoring paragraph iteration for paragraph master" ); + OSL_FAIL( "implCreateIteratedNodes(): Ignoring paragraph iteration for paragraph master" ); } else { @@ -475,7 +474,7 @@ BaseNodeSharedPtr implCreateAnimationNode( switch( xNode->getType() ) { case animations::AnimationNodeType::CUSTOM: - OSL_ENSURE( false, "implCreateAnimationNode(): " + OSL_FAIL( "implCreateAnimationNode(): " "CUSTOM not yet implemented" ); return pCreatedNode; @@ -538,7 +537,7 @@ BaseNodeSharedPtr implCreateAnimationNode( break; default: - OSL_ENSURE( false, "implCreateAnimationNode(): " + OSL_FAIL( "implCreateAnimationNode(): " "invalid AnimationNodeType" ); return pCreatedNode; } @@ -579,7 +578,7 @@ BaseNodeSharedPtr implCreateAnimationNode( NodeCreator aCreator( pCreatedContainer, rContext ); if( !::anim::for_each_childNode( xNode, aCreator ) ) { - OSL_ENSURE( false, "implCreateAnimationNode(): " + OSL_FAIL( "implCreateAnimationNode(): " "child node creation failed" ); return BaseNodeSharedPtr(); } diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index bd5c9a8868b3..9d513fa367e4 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -133,7 +133,7 @@ bool BaseContainerNode::notifyDeactivatedChild( return false; if (! isChildNode(pChildNode)) { - OSL_ENSURE( false, "unknown notifier!" ); + OSL_FAIL( "unknown notifier!" ); return false; } diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index e7343857f98b..cc3cd5b6da55 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -218,8 +218,8 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, default: case animations::AnimationRestart::DEFAULT: // same value: animations::AnimationRestart::INHERIT: - OSL_ENSURE( - false, "getStateTransitionTable(): unexpected case for restart" ); + OSL_FAIL( + "getStateTransitionTable(): unexpected case for restart" ); // FALLTHROUGH intended case animations::AnimationRestart::NEVER: nRestartValue = 0; @@ -238,8 +238,8 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, case animations::AnimationFill::AUTO: case animations::AnimationFill::DEFAULT: // same value: animations::AnimationFill::INHERIT: - OSL_ENSURE( - false, "getStateTransitionTable(): unexpected case for fill" ); + OSL_FAIL( + "getStateTransitionTable(): unexpected case for fill" ); // FALLTHROUGH intended case animations::AnimationFill::REMOVE: nFillValue = 0; diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index afb9f2bf4aa5..62904feb9d0f 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -72,7 +72,7 @@ EventSharedPtr generateEvent( case animations::Timing_INDEFINITE: break; // don't schedule no event case animations::Timing_MEDIA: - OSL_ENSURE( false, "MEDIA timing not yet implemented!" ); + OSL_FAIL( "MEDIA timing not yet implemented!" ); break; default: ENSURE_OR_THROW( false, "unexpected case!" ); @@ -83,7 +83,7 @@ EventSharedPtr generateEvent( // try to extract additional event delay double nDelay2 = 0.0; if (aEvent.Offset.hasValue() && !(aEvent.Offset >>= nDelay2)) { - OSL_ENSURE( false, "offset values apart from DOUBLE not " + OSL_FAIL( "offset values apart from DOUBLE not " "recognized in animations::Event!" ); } @@ -101,10 +101,10 @@ EventSharedPtr generateEvent( // no event at all break; case animations::EventTrigger::ON_BEGIN: - OSL_ENSURE( false, "event trigger ON_BEGIN not yet implemented!" ); + OSL_FAIL( "event trigger ON_BEGIN not yet implemented!" ); break; case animations::EventTrigger::ON_END: - OSL_ENSURE( false, "event trigger ON_END not yet implemented!" ); + OSL_FAIL( "event trigger ON_END not yet implemented!" ); break; case animations::EventTrigger::BEGIN_EVENT: // try to extract XAnimationNode event source @@ -116,7 +116,7 @@ EventSharedPtr generateEvent( pEvent, xNode ); } else { - OSL_ENSURE(false, "could not extract source XAnimationNode " + OSL_FAIL("could not extract source XAnimationNode " "for BEGIN_EVENT!" ); } break; @@ -130,7 +130,7 @@ EventSharedPtr generateEvent( pEvent, xNode ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for END_EVENT!" ); } break; @@ -146,7 +146,7 @@ EventSharedPtr generateEvent( pEvent, pShape ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for ON_CLICK!" ); } break; @@ -162,7 +162,7 @@ EventSharedPtr generateEvent( pEvent, pShape ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for ON_DBL_CLICK!" ); } break; @@ -178,7 +178,7 @@ EventSharedPtr generateEvent( pEvent, pShape ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for ON_MOUSE_ENTER!" ); } break; @@ -194,12 +194,12 @@ EventSharedPtr generateEvent( pEvent, pShape ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for ON_MOUSE_LEAVE!" ); } break; case animations::EventTrigger::ON_PREV: - OSL_ENSURE( false, "event trigger ON_PREV not yet implemented, " + OSL_FAIL( "event trigger ON_PREV not yet implemented, " "mapped to ON_NEXT!" ); // FALLTHROUGH intended case animations::EventTrigger::ON_NEXT: @@ -218,17 +218,17 @@ EventSharedPtr generateEvent( pEvent, xNode ); } else { - OSL_ENSURE( false, "could not extract source XAnimationNode " + OSL_FAIL( "could not extract source XAnimationNode " "for ON_STOP_AUDIO!" ); } break; case animations::EventTrigger::REPEAT: - OSL_ENSURE( false, "event trigger REPEAT not yet implemented!" ); + OSL_FAIL( "event trigger REPEAT not yet implemented!" ); break; } } else if (rEventDescription >>= aSequence) { - OSL_ENSURE( false, "sequence of timing primitives " + OSL_FAIL( "sequence of timing primitives " "not yet implemented!" ); } else if (rEventDescription >>= nDelay1) { diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index cf7340cd14fc..298900b67d25 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -52,7 +52,7 @@ void SequentialTimeContainer::activate_st() break; else { // node still UNRESOLVED, no need to deactivate or end... - OSL_ENSURE( false, "### resolving child failed!" ); + OSL_FAIL( "### resolving child failed!" ); } } @@ -94,7 +94,7 @@ void SequentialTimeContainer::skipEffect( "SequentialTimeContainer::deactivate, skipEffect with delay") ); } else - OSL_ENSURE( false, "unknown notifier!" ); + OSL_FAIL( "unknown notifier!" ); } void SequentialTimeContainer::rewindEffect( diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 54a212746a4a..1d2185cf8495 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -475,7 +475,7 @@ UnoViewSharedPtr EventMultiplexerImpl::findUnoView( boost::cref( xView ), boost::bind( &UnoView::getUnoView, _1 )))) == aEnd ) { - OSL_ENSURE(false, "EventMultiplexer::findUnoView(): unexpected message source" ); + OSL_FAIL("EventMultiplexer::findUnoView(): unexpected message source" ); return UnoViewSharedPtr(); } diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 1c72af8c1628..cc19ede90867 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -90,7 +90,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -266,8 +266,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index c98d34afae17..808a9756e17c 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -197,7 +197,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity() } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index ef5ba29fe169..323f16849123 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -969,8 +969,7 @@ boost::shared_ptr createDrawingLayerAnimActivity( catch( uno::Exception& ) { // translate any error into empty factory product. - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index e018c8015b0a..e2492a4ddd3a 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -174,7 +174,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -791,7 +791,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1101,7 +1101,7 @@ namespace slideshow { if (!maHyperlinkIndices.empty() && maHyperlinkIndices.back().second == -1) { - OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); + OSL_FAIL( "### pending FIELD_SEQ_END!" ); maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } @@ -1133,7 +1133,7 @@ namespace slideshow } if (!maHyperlinkIndices.empty() && maHyperlinkIndices.back().second == -1) { - OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); + OSL_FAIL( "### pending FIELD_SEQ_END!" ); maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index ed4238a538f7..f0ede5bf4bea 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -639,8 +639,7 @@ namespace slideshow case DocTreeNode::NODETYPE_INVALID: // FALLTHROUGH intended default: - OSL_ENSURE(false, - "DrawShapeSubsetting::mapDocTreeNode(): unexpected node type"); + OSL_FAIL("DrawShapeSubsetting::mapDocTreeNode(): unexpected node type"); return DrawShapeSubsetting::CLASS_NOOP; case DocTreeNode::NODETYPE_LOGICAL_SHAPE: diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 7874143ca916..25ffa679a789 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -123,7 +123,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index fde007e17d23..355a16c58608 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -99,7 +99,7 @@ bool importShapeGraphic( if(nIndex >= aURL.getLength()) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "embedded graphic has no graphic ID" ); return false; } @@ -137,7 +137,7 @@ bool importShapeGraphic( STREAM_READ ) ); if( !pGraphicStream ) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "cannot create input stream for graphic" ); return false; } @@ -146,7 +146,7 @@ bool importShapeGraphic( if( GraphicConverter::Import( *pGraphicStream, aTmpGraphic ) != ERRCODE_NONE ) { - OSL_ENSURE( false, "ShapeImporter::importShape(): " + OSL_FAIL( "ShapeImporter::importShape(): " "Failed to import shape graphic from given URL" ); return false; } diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index f22927ddd520..e7e638a632b3 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -121,7 +121,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index e8b0930e1940..18f9bc94a956 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -198,8 +198,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index e861b789e561..fc3bfacde25c 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -115,7 +115,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -335,8 +335,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -499,8 +498,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -560,8 +558,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 0c8ad7319a30..29e635b43404 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -93,7 +93,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index bf05913b56cc..e8d3a3aa23ab 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -657,8 +657,7 @@ namespace slideshow virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) { - OSL_ENSURE( false, - "BitmapView::setPriority(): This method is not supposed to be called!" ); + OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" ); } virtual ::basegfx::B2DHomMatrix getTransformation() const @@ -668,21 +667,18 @@ namespace slideshow virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const { - OSL_ENSURE( false, - "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" ); + OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" ); return ::basegfx::B2DHomMatrix(); } virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) { - OSL_ENSURE( false, - "BitmapView::setClip(): This method is not supposed to be called!" ); + OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" ); } virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) { - OSL_ENSURE( false, - "BitmapView::resize(): This method is not supposed to be called!" ); + OSL_FAIL( "BitmapView::resize(): This method is not supposed to be called!" ); return false; } @@ -717,8 +713,7 @@ namespace slideshow { // TODO(E1): Might be superfluous. Nowadays, // addViewLayer swallows all errors, anyway. - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 92adddce4108..b2b90cda722e 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -68,7 +68,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index c644a0016cc4..38cee82b4da0 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -834,8 +834,7 @@ bool SlideImpl::implPrefetchShow() { if( !maAnimations.importAnimations( mxRootNode ) ) { - OSL_ENSURE( false, - "SlideImpl::implPrefetchShow(): have animation nodes, " + OSL_FAIL( "SlideImpl::implPrefetchShow(): have animation nodes, " "but import animations failed." ); // could not import animation framework, @@ -865,8 +864,7 @@ bool SlideImpl::implPrefetchShow() } catch( uno::Exception& ) { - OSL_ENSURE( - false, + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8 ) ); @@ -979,8 +977,7 @@ bool SlideImpl::applyInitialShapeAttributes( } catch( uno::Exception& ) { - OSL_ENSURE( - false, + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8 ) ); @@ -1024,8 +1021,7 @@ bool SlideImpl::applyInitialShapeAttributes( if( !pShape ) { - OSL_ENSURE( false, - "SlideImpl::applyInitialShapeAttributes(): no shape found for given target" ); + OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): no shape found for given target" ); continue; } @@ -1034,8 +1030,7 @@ bool SlideImpl::applyInitialShapeAttributes( if( !pAttrShape ) { - OSL_ENSURE( false, - "SlideImpl::applyInitialShapeAttributes(): shape found does not " + OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not " "implement AttributableShape interface" ); continue; } @@ -1053,8 +1048,7 @@ bool SlideImpl::applyInitialShapeAttributes( if( !pAttrShape ) { - OSL_ENSURE( false, - "SlideImpl::applyInitialShapeAttributes(): shape found does not " + OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not " "provide a subset for requested paragraph index" ); continue; } @@ -1075,8 +1069,7 @@ bool SlideImpl::applyInitialShapeAttributes( } else { - OSL_ENSURE( false, - "SlideImpl::applyInitialShapeAttributes(): Unexpected " + OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): Unexpected " "(and unimplemented) property encountered" ); } } @@ -1151,15 +1144,13 @@ bool SlideImpl::loadShapes() catch( ShapeLoadFailedException& ) { // TODO(E2): Error handling. For now, bail out - OSL_ENSURE( false, - "SlideImpl::loadShapes(): caught ShapeLoadFailedException" ); + OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" ); return false; } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1196,14 +1187,12 @@ bool SlideImpl::loadShapes() catch( ShapeLoadFailedException& ) { // TODO(E2): Error handling. For now, bail out - OSL_ENSURE( false, - "SlideImpl::loadShapes(): caught ShapeLoadFailedException" ); + OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" ); return false; } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 45af355700bc..b13748fcb1c9 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -495,7 +495,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 469843fad659..2f73a3e9dfbc 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -97,8 +97,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index f02440109c46..77320f4efdd3 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1069,7 +1069,7 @@ public: } else { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1314,7 +1314,7 @@ sal_Bool SlideShowImpl::startShapeActivity( DBG_TESTSOLARMUTEX(); // TODO(F3): NYI - OSL_ENSURE( false, "not yet implemented!" ); + OSL_FAIL( "not yet implemented!" ); return false; } @@ -1328,7 +1328,7 @@ sal_Bool SlideShowImpl::stopShapeActivity( DBG_TESTSOLARMUTEX(); // TODO(F3): NYI - OSL_ENSURE( false, "not yet implemented!" ); + OSL_FAIL( "not yet implemented!" ); return false; } @@ -2167,8 +2167,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 04f840f4458f..fc632afd3b13 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -792,8 +792,7 @@ SlideView::SlideView( const uno::Reference& xView, basegfx::B2DVector(aViewTransform.m01, aViewTransform.m11).getLength()) ) { - OSL_ENSURE( false, - "SlideView::SlideView(): Singular matrix!" ); + OSL_FAIL( "SlideView::SlideView(): Singular matrix!" ); canvas::tools::setIdentityAffineMatrix2D(aViewTransform); } @@ -950,8 +949,7 @@ void SlideView::setPriority( const basegfx::B1DRange& /*rRange*/ ) { osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, - "SlideView::setPriority() is a NOOP for slide view - " + OSL_FAIL( "SlideView::setPriority() is a NOOP for slide view - " "content will always be shown in the background" ); } @@ -988,8 +986,7 @@ bool SlideView::resize( const ::basegfx::B2DRange& /*rArea*/ ) { osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, - "SlideView::resize(): ignored for the View, can't change size " + OSL_FAIL( "SlideView::resize(): ignored for the View, can't change size " "effectively, anyway" ); return false; @@ -1056,8 +1053,7 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ ) basegfx::B2DVector(aViewTransform.m01, aViewTransform.m11).getLength()) ) { - OSL_ENSURE( false, - "SlideView::modified(): Singular matrix!" ); + OSL_FAIL( "SlideView::modified(): Singular matrix!" ); canvas::tools::setIdentityAffineMatrix2D(aViewTransform); } diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 535277285d2a..a49f88d061ba 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -191,8 +191,7 @@ namespace slideshow { if( !mpContext->mbParseAnimationFunction ) { - OSL_ENSURE( false, - "ValueTFunctor::operator(): variable encountered, but we're not parsing a function here" ); + OSL_FAIL( "ValueTFunctor::operator(): variable encountered, but we're not parsing a function here" ); throw ParseError(); } diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index f856dc91d241..fa68c1741528 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -135,7 +135,7 @@ namespace slideshow dispose(); } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 6d2a43ae7119..3f2ac271f7f7 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -126,7 +126,7 @@ ClippingAnimation::~ClippingAnimation() } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -252,8 +252,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( { default: case TransitionInfo::TRANSITION_INVALID: - OSL_ENSURE( false, - "TransitionFactory::createShapeTransition(): Invalid transition type. " + OSL_FAIL( "TransitionFactory::createShapeTransition(): Invalid transition type. " "Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" ); return AnimationActivitySharedPtr(); @@ -396,8 +395,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( "combination encountered", xTransition->getTransition(), xTransition->getSubtype() ); - OSL_ENSURE( - false, + OSL_FAIL( "TransitionFactory::createShapeTransition(): Unknown type/subtype " "combination encountered" ); } diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 76996a6098c5..42dc86ac8858 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -729,8 +729,7 @@ NumberAnimationSharedPtr createPushWipeTransition( switch( nTransitionSubType ) { default: - OSL_ENSURE( - false, + OSL_FAIL( "createPushWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::PUSHWIPE " "transitions" ); @@ -821,8 +820,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( switch( nTransitionSubType ) { default: - OSL_ENSURE( - false, + OSL_FAIL( "createSlideWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::SLIDEWIPE " "transitions" ); @@ -1022,8 +1020,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( switch( nTransitionType ) { default: - OSL_ENSURE( - false, + OSL_FAIL( "TransitionFactory::createSlideTransition(): " "Unexpected transition type for " "TRANSITION_SPECIAL transitions" ); @@ -1158,8 +1155,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( "Unknown type/subtype (%d/%d) combination encountered", nTransitionType, nTransitionSubType ); - OSL_ENSURE( - false, + OSL_FAIL( "TransitionFactory::createSlideTransition(): " "Unknown type/subtype combination encountered" ); diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index b1791a47b9a3..c550a982b300 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -687,7 +687,7 @@ UserEventQueue::~UserEventQueue() clear(); } catch (uno::Exception &) { - OSL_ENSURE( false, rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 3b834b1d1e60..c96b11f6d4e9 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -148,8 +148,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) } catch( uno::Exception& ) { - OSL_ENSURE( false, - rtl::OUStringToOString( + OSL_FAIL( rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } -- cgit