mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move OSL_ENSURE(false,...) to OSL_FAIL(...)

Browse Source
This commit is contained in:
Thomas Arnhold 2011-03-12 11:41:23 +01:00
parent 2c5e690eb8
commit c64a901829
45 changed files with 117 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
animations/source/animcore/targetpropertiescreator.cxx
View File

@ -196,8 +196,7 @@ namespace animcore
{ {
if( !xNode.is() ) if( !xNode.is() )
{ {
OSL_ENSURE( false, OSL_FAIL( "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
"AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
return; return;
} }
@ -218,8 +217,7 @@ namespace animcore
// TODO(E1): I'm not too sure what to expect here... // TODO(E1): I'm not too sure what to expect here...
if( !xIterNode->getTarget().hasValue() ) if( !xIterNode->getTarget().hasValue() )
{ {
OSL_ENSURE( false, OSL_FAIL( "animcore: NodeFunctor::operator(): no target on ITERATE node" );
"animcore: NodeFunctor::operator(): no target on ITERATE node" );
return; return;
} }
@ -233,8 +231,7 @@ namespace animcore
// no shape provided. Maybe a ParagraphTarget? // no shape provided. Maybe a ParagraphTarget?
if( !(xIterNode->getTarget() >>= aTarget) ) if( !(xIterNode->getTarget() >>= aTarget) )
{ {
OSL_ENSURE( false, OSL_FAIL( "animcore: NodeFunctor::operator(): could not extract any "
"animcore: NodeFunctor::operator(): could not extract any "
"target information" ); "target information" );
return; return;
} }
@ -244,8 +241,7 @@ namespace animcore
if( !xTargetShape.is() ) if( !xTargetShape.is() )
{ {
OSL_ENSURE( false, OSL_FAIL( "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
"animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
return; return;
} }
} }
@ -261,8 +257,7 @@ namespace animcore
if( !::anim::for_each_childNode( xNode, if( !::anim::for_each_childNode( xNode,
aFunctor ) ) aFunctor ) )
{ {
OSL_ENSURE( false, OSL_FAIL( "AnimCore: NodeFunctor::operator(): child node iteration failed, "
"AnimCore: NodeFunctor::operator(): child node iteration failed, "
"or extraneous container nodes encountered" ); "or extraneous container nodes encountered" );
} }
} }
@ -321,8 +316,7 @@ namespace animcore
if( !(xAnimateNode->getTarget() >>= aUnoTarget) ) if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
{ {
OSL_ENSURE( false, OSL_FAIL( "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
"AnimCore: NodeFunctor::operator(): unknown target type encountered" );
break; break;
} }
@ -333,8 +327,7 @@ namespace animcore
if( !aTarget.mxRef.is() ) if( !aTarget.mxRef.is() )
{ {
OSL_ENSURE( false, OSL_FAIL( "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
"AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
break; // invalid target XShape break; // invalid target XShape
} }

2
sd/source/core/sdpage.cxx
View File

@ -239,7 +239,7 @@ void SdPage::EnsureMasterPageDefaultBackground()
else else
{ {
// no style found, assert and set at least XFILL_NONE // 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)); getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
} }
} }

4
sd/source/core/stlsheet.cxx
View File

@ -777,8 +777,8 @@ void SAL_CALL SdStyleSheet::release( ) throw ()
} }
catch (RuntimeException const& exc) catch (RuntimeException const& exc)
{ // don't break throw () { // don't break throw ()
OSL_ENSURE( OSL_FAIL(
false, OUStringToOString( OUStringToOString(
exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
static_cast<void>(exc); static_cast<void>(exc);
} }

4
sd/source/ui/dlg/navigatr.cxx
View File

@ -507,8 +507,8 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
break; break;
default: default:
OSL_ENSURE( OSL_FAIL(
false, "SdNavigatorWin::ShapeFilterCallback called for unknown menu entry"); "SdNavigatorWin::ShapeFilterCallback called for unknown menu entry");
break; break;
} }

2
sd/source/ui/framework/factories/TaskPanelFactory.cxx
View File

@ -272,7 +272,7 @@ void SAL_CALL TaskPanelFactory::releaseResource (
} }
else 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!" );
} }
} }
} }

2
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
View File

@ -970,7 +970,7 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const
#ifdef DBG_UTIL #ifdef DBG_UTIL
if(mbInDestructor) if(mbInDestructor)
{ {
OSL_ENSURE(false, "Higher call inside PageObjectViewObjectContact in destructor (!)"); OSL_FAIL("Higher call inside PageObjectViewObjectContact in destructor (!)");
} }
#endif #endif

4
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
View File

@ -610,13 +610,13 @@ SdPage* ToolPanelViewShell::getCurrentPage() const
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
void ToolPanelViewShell::Execute( SfxRequest& ) 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& ) void ToolPanelViewShell::GetState( SfxItemSet& )
{ {
OSL_ENSURE( false, "ToolPanelViewShell::GetState: not to be called! (right?)" ); OSL_FAIL( "ToolPanelViewShell::GetState: not to be called! (right?)" );
} }
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------

4
sd/source/ui/unoidl/unomodel.cxx
View File

@ -303,8 +303,8 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
} }
catch (uno::RuntimeException const& exc) catch (uno::RuntimeException const& exc)
{ // don't break throw () { // don't break throw ()
OSL_ENSURE( OSL_FAIL(
false, OUStringToOString( OUStringToOString(
exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
static_cast<void>(exc); static_cast<void>(exc);
} }

2
sd/source/ui/view/viewshe2.cxx
View File

@ -1199,7 +1199,7 @@ void ViewShell::AdaptDefaultsForChart(
} }
catch( const uno::Exception & ) catch( const uno::Exception & )
{ {
OSL_ENSURE( false, "Exception caught in AdaptDefaultsForChart" ); OSL_FAIL( "Exception caught in AdaptDefaultsForChart" );
} }
} }
} }

7
slideshow/source/engine/activities/activitiesfactory.cxx
View File

@ -661,8 +661,7 @@ AnimationActivitySharedPtr createActivity(
catch( ParseError& ) catch( ParseError& )
{ {
// parse error, thus no formula // parse error, thus no formula
OSL_ENSURE( false, OSL_FAIL( "createActivity(): Error parsing formula string" );
"createActivity(): Error parsing formula string" );
} }
} }
@ -728,7 +727,7 @@ AnimationActivitySharedPtr createActivity(
} }
default: default:
OSL_ENSURE( false, "createActivity(): unexpected case" ); OSL_FAIL( "createActivity(): unexpected case" );
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::AnimationCalcMode::PACED: case animations::AnimationCalcMode::PACED:
// FALLTHROUGH intended // FALLTHROUGH intended
@ -796,7 +795,7 @@ AnimationActivitySharedPtr createActivity(
} }
default: default:
OSL_ENSURE( false, "createActivity(): unexpected case" ); OSL_FAIL( "createActivity(): unexpected case" );
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::AnimationCalcMode::PACED: case animations::AnimationCalcMode::PACED:
// FALLTHROUGH intended // FALLTHROUGH intended

9
slideshow/source/engine/activities/interpolation.hxx
View File

@ -56,8 +56,7 @@ namespace basegfx
const sal_Int16& rTo, const sal_Int16& rTo,
double ) double )
{ {
OSL_ENSURE( false, OSL_FAIL( "lerp<sal_Int16> called" );
"lerp<sal_Int16> called" );
return rTo; return rTo;
} }
@ -66,8 +65,7 @@ namespace basegfx
const ::rtl::OUString& rTo, const ::rtl::OUString& rTo,
double ) double )
{ {
OSL_ENSURE( false, OSL_FAIL( "lerp<::rtl::OUString> called" );
"lerp<::rtl::OUString> called" );
return rTo; return rTo;
} }
@ -76,8 +74,7 @@ namespace basegfx
const bool& rTo, const bool& rTo,
double ) double )
{ {
OSL_ENSURE( false, OSL_FAIL( "lerp<bool> called" );
"lerp<bool> called" );
return rTo; return rTo;
} }
} }

5
slideshow/source/engine/activitiesqueue.cxx
View File

@ -73,7 +73,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -141,8 +141,7 @@ namespace slideshow
// since this will also capture segmentation // since this will also capture segmentation
// violations and the like. In such a case, we // violations and the like. In such a case, we
// still better let our clients now... // still better let our clients now...
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

8
slideshow/source/engine/animationfactory.cxx
View File

@ -693,7 +693,7 @@ namespace slideshow
if( !rAny.hasValue() ) 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", OSL_TRACE( "getDefault(): cannot get '%s' shape property",
::rtl::OUStringToOString( rPropertyName, ::rtl::OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() ); RTL_TEXTENCODING_ASCII_US ).getStr() );
@ -705,7 +705,7 @@ namespace slideshow
if( !(rAny >>= aValue) ) 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", OSL_TRACE( "getDefault(): cannot extract '%s' shape property",
::rtl::OUStringToOString( rPropertyName, ::rtl::OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() ); RTL_TEXTENCODING_ASCII_US ).getStr() );
@ -724,7 +724,7 @@ namespace slideshow
if( !rAny.hasValue() ) 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", OSL_TRACE( "getDefault(): cannot get '%s' shape color property",
::rtl::OUStringToOString( rPropertyName, ::rtl::OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() ); RTL_TEXTENCODING_ASCII_US ).getStr() );
@ -736,7 +736,7 @@ namespace slideshow
if( !(rAny >>= nValue) ) 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", OSL_TRACE( "getDefault(): cannot extract '%s' shape color property",
::rtl::OUStringToOString( rPropertyName, ::rtl::OUStringToOString( rPropertyName,
RTL_TEXTENCODING_ASCII_US ).getStr() ); RTL_TEXTENCODING_ASCII_US ).getStr() );

2
slideshow/source/engine/animationnodes/animationbasenode.cxx
View File

@ -217,7 +217,7 @@ bool AnimationBaseNode::init_st()
mpActivity = createActivity(); mpActivity = createActivity();
} }
catch (uno::Exception const&) { catch (uno::Exception const&) {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString(cppu::getCaughtException()), comphelper::anyToString(cppu::getCaughtException()),
RTL_TEXTENCODING_UTF8 ) ); RTL_TEXTENCODING_UTF8 ) );
// catch and ignore. We later handle empty activities, but for // catch and ignore. We later handle empty activities, but for

9
slideshow/source/engine/animationnodes/animationnodefactory.cxx
View File

@ -371,8 +371,7 @@ bool implCreateIteratedNodes(
{ {
// will not animate the whole paragraph, when // will not animate the whole paragraph, when
// only the paragraph is animated at all. // only the paragraph is animated at all.
OSL_ENSURE( false, OSL_FAIL( "implCreateIteratedNodes(): Ignoring paragraph iteration for paragraph master" );
"implCreateIteratedNodes(): Ignoring paragraph iteration for paragraph master" );
} }
else else
{ {
@ -475,7 +474,7 @@ BaseNodeSharedPtr implCreateAnimationNode(
switch( xNode->getType() ) switch( xNode->getType() )
{ {
case animations::AnimationNodeType::CUSTOM: case animations::AnimationNodeType::CUSTOM:
OSL_ENSURE( false, "implCreateAnimationNode(): " OSL_FAIL( "implCreateAnimationNode(): "
"CUSTOM not yet implemented" ); "CUSTOM not yet implemented" );
return pCreatedNode; return pCreatedNode;
@ -538,7 +537,7 @@ BaseNodeSharedPtr implCreateAnimationNode(
break; break;
default: default:
OSL_ENSURE( false, "implCreateAnimationNode(): " OSL_FAIL( "implCreateAnimationNode(): "
"invalid AnimationNodeType" ); "invalid AnimationNodeType" );
return pCreatedNode; return pCreatedNode;
} }
@ -579,7 +578,7 @@ BaseNodeSharedPtr implCreateAnimationNode(
NodeCreator aCreator( pCreatedContainer, rContext ); NodeCreator aCreator( pCreatedContainer, rContext );
if( !::anim::for_each_childNode( xNode, aCreator ) ) if( !::anim::for_each_childNode( xNode, aCreator ) )
{ {
OSL_ENSURE( false, "implCreateAnimationNode(): " OSL_FAIL( "implCreateAnimationNode(): "
"child node creation failed" ); "child node creation failed" );
return BaseNodeSharedPtr(); return BaseNodeSharedPtr();
} }

2
slideshow/source/engine/animationnodes/basecontainernode.cxx
View File

@ -133,7 +133,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
return false; return false;
if (! isChildNode(pChildNode)) { if (! isChildNode(pChildNode)) {
OSL_ENSURE( false, "unknown notifier!" ); OSL_FAIL( "unknown notifier!" );
return false; return false;
} }

8
slideshow/source/engine/animationnodes/basenode.cxx
View File

@ -218,8 +218,8 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
default: default:
case animations::AnimationRestart::DEFAULT: case animations::AnimationRestart::DEFAULT:
// same value: animations::AnimationRestart::INHERIT: // same value: animations::AnimationRestart::INHERIT:
OSL_ENSURE( OSL_FAIL(
false, "getStateTransitionTable(): unexpected case for restart" ); "getStateTransitionTable(): unexpected case for restart" );
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::AnimationRestart::NEVER: case animations::AnimationRestart::NEVER:
nRestartValue = 0; nRestartValue = 0;
@ -238,8 +238,8 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode,
case animations::AnimationFill::AUTO: case animations::AnimationFill::AUTO:
case animations::AnimationFill::DEFAULT: case animations::AnimationFill::DEFAULT:
// same value: animations::AnimationFill::INHERIT: // same value: animations::AnimationFill::INHERIT:
OSL_ENSURE( OSL_FAIL(
false, "getStateTransitionTable(): unexpected case for fill" ); "getStateTransitionTable(): unexpected case for fill" );
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::AnimationFill::REMOVE: case animations::AnimationFill::REMOVE:
nFillValue = 0; nFillValue = 0;

28
slideshow/source/engine/animationnodes/generateevent.cxx
View File

@ -72,7 +72,7 @@ EventSharedPtr generateEvent(
case animations::Timing_INDEFINITE: case animations::Timing_INDEFINITE:
break; // don't schedule no event break; // don't schedule no event
case animations::Timing_MEDIA: case animations::Timing_MEDIA:
OSL_ENSURE( false, "MEDIA timing not yet implemented!" ); OSL_FAIL( "MEDIA timing not yet implemented!" );
break; break;
default: default:
ENSURE_OR_THROW( false, "unexpected case!" ); ENSURE_OR_THROW( false, "unexpected case!" );
@ -83,7 +83,7 @@ EventSharedPtr generateEvent(
// try to extract additional event delay // try to extract additional event delay
double nDelay2 = 0.0; double nDelay2 = 0.0;
if (aEvent.Offset.hasValue() && !(aEvent.Offset >>= nDelay2)) { 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!" ); "recognized in animations::Event!" );
} }
@ -101,10 +101,10 @@ EventSharedPtr generateEvent(
// no event at all // no event at all
break; break;
case animations::EventTrigger::ON_BEGIN: 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; break;
case animations::EventTrigger::ON_END: 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; break;
case animations::EventTrigger::BEGIN_EVENT: case animations::EventTrigger::BEGIN_EVENT:
// try to extract XAnimationNode event source // try to extract XAnimationNode event source
@ -116,7 +116,7 @@ EventSharedPtr generateEvent(
pEvent, xNode ); pEvent, xNode );
} }
else { else {
OSL_ENSURE(false, "could not extract source XAnimationNode " OSL_FAIL("could not extract source XAnimationNode "
"for BEGIN_EVENT!" ); "for BEGIN_EVENT!" );
} }
break; break;
@ -130,7 +130,7 @@ EventSharedPtr generateEvent(
pEvent, xNode ); pEvent, xNode );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for END_EVENT!" ); "for END_EVENT!" );
} }
break; break;
@ -146,7 +146,7 @@ EventSharedPtr generateEvent(
pEvent, pShape ); pEvent, pShape );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for ON_CLICK!" ); "for ON_CLICK!" );
} }
break; break;
@ -162,7 +162,7 @@ EventSharedPtr generateEvent(
pEvent, pShape ); pEvent, pShape );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for ON_DBL_CLICK!" ); "for ON_DBL_CLICK!" );
} }
break; break;
@ -178,7 +178,7 @@ EventSharedPtr generateEvent(
pEvent, pShape ); pEvent, pShape );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for ON_MOUSE_ENTER!" ); "for ON_MOUSE_ENTER!" );
} }
break; break;
@ -194,12 +194,12 @@ EventSharedPtr generateEvent(
pEvent, pShape ); pEvent, pShape );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for ON_MOUSE_LEAVE!" ); "for ON_MOUSE_LEAVE!" );
} }
break; break;
case animations::EventTrigger::ON_PREV: 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!" ); "mapped to ON_NEXT!" );
// FALLTHROUGH intended // FALLTHROUGH intended
case animations::EventTrigger::ON_NEXT: case animations::EventTrigger::ON_NEXT:
@ -218,17 +218,17 @@ EventSharedPtr generateEvent(
pEvent, xNode ); pEvent, xNode );
} }
else { else {
OSL_ENSURE( false, "could not extract source XAnimationNode " OSL_FAIL( "could not extract source XAnimationNode "
"for ON_STOP_AUDIO!" ); "for ON_STOP_AUDIO!" );
} }
break; break;
case animations::EventTrigger::REPEAT: case animations::EventTrigger::REPEAT:
OSL_ENSURE( false, "event trigger REPEAT not yet implemented!" ); OSL_FAIL( "event trigger REPEAT not yet implemented!" );
break; break;
} }
} }
else if (rEventDescription >>= aSequence) { else if (rEventDescription >>= aSequence) {
OSL_ENSURE( false, "sequence of timing primitives " OSL_FAIL( "sequence of timing primitives "
"not yet implemented!" ); "not yet implemented!" );
} }
else if (rEventDescription >>= nDelay1) { else if (rEventDescription >>= nDelay1) {

4
slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
View File

@ -52,7 +52,7 @@ void SequentialTimeContainer::activate_st()
break; break;
else { else {
// node still UNRESOLVED, no need to deactivate or end... // 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") ); "SequentialTimeContainer::deactivate, skipEffect with delay") );
} }
else else
OSL_ENSURE( false, "unknown notifier!" ); OSL_FAIL( "unknown notifier!" );
} }
void SequentialTimeContainer::rewindEffect( void SequentialTimeContainer::rewindEffect(

2
slideshow/source/engine/eventmultiplexer.cxx
View File

@ -475,7 +475,7 @@ UnoViewSharedPtr EventMultiplexerImpl::findUnoView(
boost::cref( xView ), boost::cref( xView ),
boost::bind( &UnoView::getUnoView, _1 )))) == aEnd ) boost::bind( &UnoView::getUnoView, _1 )))) == aEnd )
{ {
OSL_ENSURE(false, "EventMultiplexer::findUnoView(): unexpected message source" ); OSL_FAIL("EventMultiplexer::findUnoView(): unexpected message source" );
return UnoViewSharedPtr(); return UnoViewSharedPtr();
} }

5
slideshow/source/engine/eventqueue.cxx
View File

@ -90,7 +90,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -266,8 +266,7 @@ namespace slideshow
// since this will also capture segmentation // since this will also capture segmentation
// violations and the like. In such a case, we // violations and the like. In such a case, we
// still better let our clients now... // still better let our clients now...
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

2
slideshow/source/engine/rehearsetimingsactivity.cxx
View File

@ -197,7 +197,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity()
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

3
slideshow/source/engine/shapes/drawinglayeranimation.cxx
View File

@ -969,8 +969,7 @@ boost::shared_ptr<Activity> createDrawingLayerAnimActivity(
catch( uno::Exception& ) catch( uno::Exception& )
{ {
// translate any error into empty factory product. // translate any error into empty factory product.
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

8
slideshow/source/engine/shapes/drawshape.cxx
View File

@ -174,7 +174,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -791,7 +791,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -1101,7 +1101,7 @@ namespace slideshow
{ {
if (!maHyperlinkIndices.empty() && if (!maHyperlinkIndices.empty() &&
maHyperlinkIndices.back().second == -1) { maHyperlinkIndices.back().second == -1) {
OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); OSL_FAIL( "### pending FIELD_SEQ_END!" );
maHyperlinkIndices.pop_back(); maHyperlinkIndices.pop_back();
maHyperlinkRegions.pop_back(); maHyperlinkRegions.pop_back();
} }
@ -1133,7 +1133,7 @@ namespace slideshow
} }
if (!maHyperlinkIndices.empty() && if (!maHyperlinkIndices.empty() &&
maHyperlinkIndices.back().second == -1) { maHyperlinkIndices.back().second == -1) {
OSL_ENSURE( false, "### pending FIELD_SEQ_END!" ); OSL_FAIL( "### pending FIELD_SEQ_END!" );
maHyperlinkIndices.pop_back(); maHyperlinkIndices.pop_back();
maHyperlinkRegions.pop_back(); maHyperlinkRegions.pop_back();
} }

3
slideshow/source/engine/shapes/drawshapesubsetting.cxx
View File

@ -639,8 +639,7 @@ namespace slideshow
case DocTreeNode::NODETYPE_INVALID: case DocTreeNode::NODETYPE_INVALID:
// FALLTHROUGH intended // FALLTHROUGH intended
default: default:
OSL_ENSURE(false, OSL_FAIL("DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
"DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
return DrawShapeSubsetting::CLASS_NOOP; return DrawShapeSubsetting::CLASS_NOOP;
case DocTreeNode::NODETYPE_LOGICAL_SHAPE: case DocTreeNode::NODETYPE_LOGICAL_SHAPE:

2
slideshow/source/engine/shapes/externalshapebase.cxx
View File

@ -123,7 +123,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

6
slideshow/source/engine/shapes/shapeimporter.cxx
View File

@ -99,7 +99,7 @@ bool importShapeGraphic(
if(nIndex >= aURL.getLength()) if(nIndex >= aURL.getLength())
{ {
OSL_ENSURE( false, "ShapeImporter::importShape(): " OSL_FAIL( "ShapeImporter::importShape(): "
"embedded graphic has no graphic ID" ); "embedded graphic has no graphic ID" );
return false; return false;
} }
@ -137,7 +137,7 @@ bool importShapeGraphic(
STREAM_READ ) ); STREAM_READ ) );
if( !pGraphicStream ) if( !pGraphicStream )
{ {
OSL_ENSURE( false, "ShapeImporter::importShape(): " OSL_FAIL( "ShapeImporter::importShape(): "
"cannot create input stream for graphic" ); "cannot create input stream for graphic" );
return false; return false;
} }
@ -146,7 +146,7 @@ bool importShapeGraphic(
if( GraphicConverter::Import( if( GraphicConverter::Import(
*pGraphicStream, aTmpGraphic ) != ERRCODE_NONE ) *pGraphicStream, aTmpGraphic ) != ERRCODE_NONE )
{ {
OSL_ENSURE( false, "ShapeImporter::importShape(): " OSL_FAIL( "ShapeImporter::importShape(): "
"Failed to import shape graphic from given URL" ); "Failed to import shape graphic from given URL" );
return false; return false;
} }

2
slideshow/source/engine/shapes/viewappletshape.cxx
View File

@ -121,7 +121,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

3
slideshow/source/engine/shapes/viewbackgroundshape.cxx
View File

@ -198,8 +198,7 @@ namespace slideshow
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

11
slideshow/source/engine/shapes/viewmediashape.cxx
View File

@ -115,7 +115,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -335,8 +335,7 @@ namespace slideshow
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }
@ -499,8 +498,7 @@ namespace slideshow
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }
@ -560,8 +558,7 @@ namespace slideshow
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

2
slideshow/source/engine/shapesubset.cxx
View File

@ -93,7 +93,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

15
slideshow/source/engine/slide/layermanager.cxx
View File

@ -657,8 +657,7 @@ namespace slideshow
virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) virtual void setPriority( const basegfx::B1DRange& /*rRange*/ )
{ {
OSL_ENSURE( false, OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" );
"BitmapView::setPriority(): This method is not supposed to be called!" );
} }
virtual ::basegfx::B2DHomMatrix getTransformation() const virtual ::basegfx::B2DHomMatrix getTransformation() const
@ -668,21 +667,18 @@ namespace slideshow
virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const
{ {
OSL_ENSURE( false, OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" );
"BitmapView::getSpriteTransformation(): This method is not supposed to be called!" );
return ::basegfx::B2DHomMatrix(); return ::basegfx::B2DHomMatrix();
} }
virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ )
{ {
OSL_ENSURE( false, OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" );
"BitmapView::setClip(): This method is not supposed to be called!" );
} }
virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ )
{ {
OSL_ENSURE( false, OSL_FAIL( "BitmapView::resize(): This method is not supposed to be called!" );
"BitmapView::resize(): This method is not supposed to be called!" );
return false; return false;
} }
@ -717,8 +713,7 @@ namespace slideshow
{ {
// TODO(E1): Might be superfluous. Nowadays, // TODO(E1): Might be superfluous. Nowadays,
// addViewLayer swallows all errors, anyway. // addViewLayer swallows all errors, anyway.
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

2
slideshow/source/engine/slide/slideanimations.cxx
View File

@ -68,7 +68,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

33
slideshow/source/engine/slide/slideimpl.cxx
View File

@ -834,8 +834,7 @@ bool SlideImpl::implPrefetchShow()
{ {
if( !maAnimations.importAnimations( mxRootNode ) ) if( !maAnimations.importAnimations( mxRootNode ) )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::implPrefetchShow(): have animation nodes, "
"SlideImpl::implPrefetchShow(): have animation nodes, "
"but import animations failed." ); "but import animations failed." );
// could not import animation framework, // could not import animation framework,
@ -865,8 +864,7 @@ bool SlideImpl::implPrefetchShow()
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( OSL_FAIL(
false,
rtl::OUStringToOString( rtl::OUStringToOString(
comphelper::anyToString(cppu::getCaughtException()), comphelper::anyToString(cppu::getCaughtException()),
RTL_TEXTENCODING_UTF8 ) ); RTL_TEXTENCODING_UTF8 ) );
@ -979,8 +977,7 @@ bool SlideImpl::applyInitialShapeAttributes(
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( OSL_FAIL(
false,
rtl::OUStringToOString( rtl::OUStringToOString(
comphelper::anyToString(cppu::getCaughtException()), comphelper::anyToString(cppu::getCaughtException()),
RTL_TEXTENCODING_UTF8 ) ); RTL_TEXTENCODING_UTF8 ) );
@ -1024,8 +1021,7 @@ bool SlideImpl::applyInitialShapeAttributes(
if( !pShape ) if( !pShape )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): no shape found for given target" );
"SlideImpl::applyInitialShapeAttributes(): no shape found for given target" );
continue; continue;
} }
@ -1034,8 +1030,7 @@ bool SlideImpl::applyInitialShapeAttributes(
if( !pAttrShape ) if( !pAttrShape )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not "
"SlideImpl::applyInitialShapeAttributes(): shape found does not "
"implement AttributableShape interface" ); "implement AttributableShape interface" );
continue; continue;
} }
@ -1053,8 +1048,7 @@ bool SlideImpl::applyInitialShapeAttributes(
if( !pAttrShape ) if( !pAttrShape )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): shape found does not "
"SlideImpl::applyInitialShapeAttributes(): shape found does not "
"provide a subset for requested paragraph index" ); "provide a subset for requested paragraph index" );
continue; continue;
} }
@ -1075,8 +1069,7 @@ bool SlideImpl::applyInitialShapeAttributes(
} }
else else
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::applyInitialShapeAttributes(): Unexpected "
"SlideImpl::applyInitialShapeAttributes(): Unexpected "
"(and unimplemented) property encountered" ); "(and unimplemented) property encountered" );
} }
} }
@ -1151,15 +1144,13 @@ bool SlideImpl::loadShapes()
catch( ShapeLoadFailedException& ) catch( ShapeLoadFailedException& )
{ {
// TODO(E2): Error handling. For now, bail out // TODO(E2): Error handling. For now, bail out
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
"SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
return false; return false;
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -1196,14 +1187,12 @@ bool SlideImpl::loadShapes()
catch( ShapeLoadFailedException& ) catch( ShapeLoadFailedException& )
{ {
// TODO(E2): Error handling. For now, bail out // TODO(E2): Error handling. For now, bail out
OSL_ENSURE( false, OSL_FAIL( "SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
"SlideImpl::loadShapes(): caught ShapeLoadFailedException" );
return false; return false;
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

2
slideshow/source/engine/slide/userpaintoverlay.cxx
View File

@ -495,7 +495,7 @@ namespace slideshow
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

3
slideshow/source/engine/slidebitmap.cxx
View File

@ -97,8 +97,7 @@ namespace slideshow
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

9
slideshow/source/engine/slideshowimpl.cxx
View File

@ -1069,7 +1069,7 @@ public:
} }
else else
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
@ -1314,7 +1314,7 @@ sal_Bool SlideShowImpl::startShapeActivity(
DBG_TESTSOLARMUTEX(); DBG_TESTSOLARMUTEX();
// TODO(F3): NYI // TODO(F3): NYI
OSL_ENSURE( false, "not yet implemented!" ); OSL_FAIL( "not yet implemented!" );
return false; return false;
} }
@ -1328,7 +1328,7 @@ sal_Bool SlideShowImpl::stopShapeActivity(
DBG_TESTSOLARMUTEX(); DBG_TESTSOLARMUTEX();
// TODO(F3): NYI // TODO(F3): NYI
OSL_ENSURE( false, "not yet implemented!" ); OSL_FAIL( "not yet implemented!" );
return false; return false;
} }
@ -2167,8 +2167,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

12
slideshow/source/engine/slideview.cxx
View File

@ -792,8 +792,7 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& xView,
basegfx::B2DVector(aViewTransform.m01, basegfx::B2DVector(aViewTransform.m01,
aViewTransform.m11).getLength()) ) aViewTransform.m11).getLength()) )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideView::SlideView(): Singular matrix!" );
"SlideView::SlideView(): Singular matrix!" );
canvas::tools::setIdentityAffineMatrix2D(aViewTransform); canvas::tools::setIdentityAffineMatrix2D(aViewTransform);
} }
@ -950,8 +949,7 @@ void SlideView::setPriority( const basegfx::B1DRange& /*rRange*/ )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
OSL_ENSURE( false, OSL_FAIL( "SlideView::setPriority() is a NOOP for slide view - "
"SlideView::setPriority() is a NOOP for slide view - "
"content will always be shown in the background" ); "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::MutexGuard aGuard( m_aMutex );
OSL_ENSURE( false, OSL_FAIL( "SlideView::resize(): ignored for the View, can't change size "
"SlideView::resize(): ignored for the View, can't change size "
"effectively, anyway" ); "effectively, anyway" );
return false; return false;
@ -1056,8 +1053,7 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ )
basegfx::B2DVector(aViewTransform.m01, basegfx::B2DVector(aViewTransform.m01,
aViewTransform.m11).getLength()) ) aViewTransform.m11).getLength()) )
{ {
OSL_ENSURE( false, OSL_FAIL( "SlideView::modified(): Singular matrix!" );
"SlideView::modified(): Singular matrix!" );
canvas::tools::setIdentityAffineMatrix2D(aViewTransform); canvas::tools::setIdentityAffineMatrix2D(aViewTransform);
} }

3
slideshow/source/engine/smilfunctionparser.cxx
View File

@ -191,8 +191,7 @@ namespace slideshow
{ {
if( !mpContext->mbParseAnimationFunction ) if( !mpContext->mbParseAnimationFunction )
{ {
OSL_ENSURE( false, OSL_FAIL( "ValueTFunctor::operator(): variable encountered, but we're not parsing a function here" );
"ValueTFunctor::operator(): variable encountered, but we're not parsing a function here" );
throw ParseError(); throw ParseError();
} }

2
slideshow/source/engine/soundplayer.cxx
View File

@ -135,7 +135,7 @@ namespace slideshow
dispose(); dispose();
} }
catch (uno::Exception &) { catch (uno::Exception &) {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

8
slideshow/source/engine/transitions/shapetransitionfactory.cxx
View File

@ -126,7 +126,7 @@ ClippingAnimation::~ClippingAnimation()
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
@ -252,8 +252,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
{ {
default: default:
case TransitionInfo::TRANSITION_INVALID: case TransitionInfo::TRANSITION_INVALID:
OSL_ENSURE( false, OSL_FAIL( "TransitionFactory::createShapeTransition(): Invalid transition type. "
"TransitionFactory::createShapeTransition(): Invalid transition type. "
"Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" ); "Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" );
return AnimationActivitySharedPtr(); return AnimationActivitySharedPtr();
@ -396,8 +395,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
"combination encountered", "combination encountered",
xTransition->getTransition(), xTransition->getTransition(),
xTransition->getSubtype() ); xTransition->getSubtype() );
OSL_ENSURE( OSL_FAIL(
false,
"TransitionFactory::createShapeTransition(): Unknown type/subtype " "TransitionFactory::createShapeTransition(): Unknown type/subtype "
"combination encountered" ); "combination encountered" );
} }

12
slideshow/source/engine/transitions/slidetransitionfactory.cxx
View File

@ -729,8 +729,7 @@ NumberAnimationSharedPtr createPushWipeTransition(
switch( nTransitionSubType ) switch( nTransitionSubType )
{ {
default: default:
OSL_ENSURE( OSL_FAIL(
false,
"createPushWipeTransition(): Unexpected transition " "createPushWipeTransition(): Unexpected transition "
"subtype for animations::TransitionType::PUSHWIPE " "subtype for animations::TransitionType::PUSHWIPE "
"transitions" ); "transitions" );
@ -821,8 +820,7 @@ NumberAnimationSharedPtr createSlideWipeTransition(
switch( nTransitionSubType ) switch( nTransitionSubType )
{ {
default: default:
OSL_ENSURE( OSL_FAIL(
false,
"createSlideWipeTransition(): Unexpected transition " "createSlideWipeTransition(): Unexpected transition "
"subtype for animations::TransitionType::SLIDEWIPE " "subtype for animations::TransitionType::SLIDEWIPE "
"transitions" ); "transitions" );
@ -1022,8 +1020,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
switch( nTransitionType ) switch( nTransitionType )
{ {
default: default:
OSL_ENSURE( OSL_FAIL(
false,
"TransitionFactory::createSlideTransition(): " "TransitionFactory::createSlideTransition(): "
"Unexpected transition type for " "Unexpected transition type for "
"TRANSITION_SPECIAL transitions" ); "TRANSITION_SPECIAL transitions" );
@ -1158,8 +1155,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
"Unknown type/subtype (%d/%d) combination encountered", "Unknown type/subtype (%d/%d) combination encountered",
nTransitionType, nTransitionType,
nTransitionSubType ); nTransitionSubType );
OSL_ENSURE( OSL_FAIL(
false,
"TransitionFactory::createSlideTransition(): " "TransitionFactory::createSlideTransition(): "
"Unknown type/subtype combination encountered" ); "Unknown type/subtype combination encountered" );

2
slideshow/source/engine/usereventqueue.cxx
View File

@ -687,7 +687,7 @@ UserEventQueue::~UserEventQueue()
clear(); clear();
} }
catch (uno::Exception &) { catch (uno::Exception &) {
OSL_ENSURE( false, rtl::OUStringToOString( OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( comphelper::anyToString(
cppu::getCaughtException() ), cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );

3
slideshow/source/engine/waitsymbol.cxx
View File

@ -148,8 +148,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView )
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }

3
slideshow/test/demoshow.cxx
View File

@ -550,8 +550,7 @@ void DemoApp::Main()
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
OSL_ENSURE( false, OSL_FAIL( rtl::OUStringToOString(
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ), comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
} }