[Libreoffice-commits] .: 7 commits - animations/source sd/source slideshow/source slideshow/test
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:48:28 PDT 2011
animations/source/animcore/targetpropertiescreator.cxx | 21 +----
sd/source/core/CustomAnimationCloner.cxx | 6 -
sd/source/core/CustomAnimationPreset.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/sdpage.cxx | 2
sd/source/core/stlfamily.cxx | 12 +--
sd/source/core/stlsheet.cxx | 4 -
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/htmlex.cxx | 4 -
sd/source/filter/xml/sdxmlwrp.cxx | 12 +--
sd/source/helper/simplereferencecomponent.cxx | 2
sd/source/ui/dlg/filedlg.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 4 -
sd/source/ui/framework/factories/TaskPanelFactory.cxx | 2
sd/source/ui/notes/TextLogger.cxx | 4 -
sd/source/ui/slideshow/slideshowimpl.cxx | 40 +++++-----
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 2
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 -
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 4 -
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/viewshe2.cxx | 2
slideshow/source/engine/activities/activitiesfactory.cxx | 7 -
slideshow/source/engine/activities/interpolation.hxx | 9 --
slideshow/source/engine/activitiesqueue.cxx | 5 -
slideshow/source/engine/animationfactory.cxx | 8 +-
slideshow/source/engine/animationnodes/animationbasenode.cxx | 2
slideshow/source/engine/animationnodes/animationnodefactory.cxx | 9 +-
slideshow/source/engine/animationnodes/basecontainernode.cxx | 2
slideshow/source/engine/animationnodes/basenode.cxx | 8 +-
slideshow/source/engine/animationnodes/generateevent.cxx | 28 +++----
slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 4 -
slideshow/source/engine/eventmultiplexer.cxx | 2
slideshow/source/engine/eventqueue.cxx | 5 -
slideshow/source/engine/rehearsetimingsactivity.cxx | 2
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 3
slideshow/source/engine/shapes/drawshape.cxx | 8 +-
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 3
slideshow/source/engine/shapes/externalshapebase.cxx | 2
slideshow/source/engine/shapes/shapeimporter.cxx | 6 -
slideshow/source/engine/shapes/viewappletshape.cxx | 2
slideshow/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
slideshow/source/engine/transitions/shapetransitionfactory.cxx | 8 --
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 12 +--
slideshow/source/engine/usereventqueue.cxx | 2
slideshow/source/engine/waitsymbol.cxx | 3
slideshow/test/demoshow.cxx | 3
58 files changed, 163 insertions(+), 214 deletions(-)
New commits:
commit 9c1555f0d7deabb64bcfaf05e3baf2508cbb3f66
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 13:16:57 2011 +0100
OSL_TRACE: Use format string
diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx
index e3f9cf8..98ad5ba 100644
--- a/sd/source/ui/notes/TextLogger.cxx
+++ b/sd/source/ui/notes/TextLogger.cxx
@@ -63,7 +63,7 @@ TextLogger::TextLogger (void)
void TextLogger::AppendText (const char* sText)
{
- OSL_TRACE (sText);
+ OSL_TRACE("%s", sText);
if (mpEditWindow != NULL)
mpEditWindow->InsertText (UniString::CreateFromAscii(sText));
}
@@ -74,7 +74,7 @@ void TextLogger::AppendText (const char* sText)
void TextLogger::AppendText (const String& sText)
{
ByteString s(sText, RTL_TEXTENCODING_ISO_8859_1);
- OSL_TRACE (s.GetBuffer());
+ OSL_TRACE("%s", s.GetBuffer());
if (mpEditWindow != NULL)
mpEditWindow->InsertText (sText);
}
commit 5f48d23390ab013da846ada3b94e728296b65a51
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:07:27 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 44bb8dc..7103c61 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -538,7 +538,7 @@ void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListene
Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
return Reference<XPropertySetInfo>();
}
@@ -546,7 +546,7 @@ Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeEx
void SdStyleFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
// ----------------------------------------------------------
@@ -575,28 +575,28 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
// ----------------------------------------------------------
void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
// ----------------------------------------------------------
void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
// ----------------------------------------------------------
void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 7ce332a..e7e391b 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -75,7 +75,7 @@ void SimpleReferenceComponent::release()
{
#if OSL_DEBUG_LEVEL > 0
rtl::OString msg( rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_ENSURE( 0, msg.getStr() );
+ OSL_FAIL( msg.getStr() );
#endif
}
}
commit 200178c78fecacce1b65cfe4857277c4d5e1d6f3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:41:23 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index cdacbea..1958ac8 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -196,8 +196,7 @@ namespace animcore
{
if( !xNode.is() )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
return;
}
@@ -218,8 +217,7 @@ namespace animcore
// TODO(E1): I'm not too sure what to expect here...
if( !xIterNode->getTarget().hasValue() )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): no target on ITERATE node" );
+ OSL_FAIL( "animcore: NodeFunctor::operator(): no target on ITERATE node" );
return;
}
@@ -233,8 +231,7 @@ namespace animcore
// no shape provided. Maybe a ParagraphTarget?
if( !(xIterNode->getTarget() >>= aTarget) )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): could not extract any "
+ OSL_FAIL( "animcore: NodeFunctor::operator(): could not extract any "
"target information" );
return;
}
@@ -244,8 +241,7 @@ namespace animcore
if( !xTargetShape.is() )
{
- OSL_ENSURE( false,
- "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
+ OSL_FAIL( "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
return;
}
}
@@ -261,8 +257,7 @@ namespace animcore
if( !::anim::for_each_childNode( xNode,
aFunctor ) )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): child node iteration failed, "
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): child node iteration failed, "
"or extraneous container nodes encountered" );
}
}
@@ -321,8 +316,7 @@ namespace animcore
if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
break;
}
@@ -333,8 +327,7 @@ namespace animcore
if( !aTarget.mxRef.is() )
{
- OSL_ENSURE( false,
- "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
+ OSL_FAIL( "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
break; // invalid target XShape
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index badbb73..7688e98 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 6b54e05..ede6ff5 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 77d9f15..bc34428 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 1830612..f855739 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 4984fcd..f5b614c 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 03260de..1be7d24 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 5365cc6..4864eca 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 44edda9..8f29253 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" );
}
}
}
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index f42a649..f4e7481 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 5efa0f0..97e1382 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;
}
}
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 7617495..c9d7900 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 eefb344..6e7ab28 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 ee979e6..1070050 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 7e2f3bb..feeb9ae 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 8ee1c19..3cb8a36 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 71450cb..a8bc7c7 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 40380b0..909997e 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 1fab094..269e0be 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 2fdd52b..28ca274 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 2e8cd72..c347200 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 439601c..325b86d 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 855ffd1..1bf19b9 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -969,8 +969,7 @@ boost::shared_ptr<Activity> 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 605532f..d791c95 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 a5bb8c8..4cd07ea 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 2d70a5b..0051c24 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 b39b5fd..a102121 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 d6f472e..1ef00d7 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 e849017..c18cc26 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 47ea7b1..4e2f794 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 2528c4a..a06bd34 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 5f85cca..ed7a14a 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 0e459a8..62902c8 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 84b8253..1021723 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 80a033c..586ef2e 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 4afa0ff..260d9e6 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 7c31ff7..1ca2683 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 376b8a3..6834dc9 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -792,8 +792,7 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& 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 69a61c5..d9ce6f5 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 07b5c57..0ee0310 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 755ef8a..963b4b3 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 0de2f47..abb9195 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 48b588a..1e7aa80 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 022ad0e..f7bb88b 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() );
}
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index b7feb85..2e80b45 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -550,8 +550,7 @@ void DemoApp::Main()
}
catch( uno::Exception& )
{
- OSL_ENSURE( false,
- rtl::OUStringToOString(
+ OSL_FAIL( rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
}
commit b55429cd72e45ae71265ac50b74bee271d3d7551
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:57:28 2011 +0100
Move DBG_ERROR to OSL_FAIL (multiline)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 102a9d0..943b379 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -880,7 +880,7 @@ bool SlideshowImpl::startPreview(
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::startPreview(), "
"exception caught: ") +
rtl::OUStringToOString(
commit 779e3194e5370178c1c91dea914d99b6324ee29c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 15:21:20 2011 +0100
Move DBG_ERROR to OSL_FAIL for getStr() (multiline)
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index bee30f9..d931f1a 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -140,7 +140,7 @@ namespace sd
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::Clone(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -225,7 +225,7 @@ namespace sd
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformNode(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -300,7 +300,7 @@ namespace sd
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformValue(), "
"exception caught: ") +
rtl::OUStringToOString(
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 2637f18..f13fc61 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1276,7 +1276,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo)
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(rtl::OString("sd::SdDrawDocument::GetDocumentStream(), "
"exception caught: ") +
rtl::OUStringToOString(
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 02f1416..7acb9a1 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -547,7 +547,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
}
catch( Exception& )
{
- DBG_ERROR(
+ OSL_FAIL(
(rtl::OString("SdGRFFilter::SaveGraphic(), "
"exception caught: ") +
rtl::OUStringToOString(
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e90bbfd..b9604b0 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3084,7 +3084,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA
catch( com::sun::star::uno::Exception& e )
{
(void)e;
- DBG_ERROR((OString("sd::HtmlExport::checkFileExists(), exception caught: ") +
+ OSL_FAIL((OString("sd::HtmlExport::checkFileExists(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
}
@@ -3147,7 +3147,7 @@ bool HtmlExport::checkForExistingFiles()
catch( Exception& e )
{
(void)e;
- DBG_ERROR((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") +
+ OSL_FAIL((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
bFound = false;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8db1fe0..102a9d0 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -344,7 +344,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::AnimationSlideController::getSlideAPI(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -651,7 +651,7 @@ void SAL_CALL SlideshowImpl::disposing()
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::stop(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -786,7 +786,7 @@ bool SlideshowImpl::startPreview(
if (supportedServices[pos].equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.drawing.MasterPage") )) {
- DBG_ERROR("sd::SlideshowImpl::startPreview() "
+ OSL_FAIL("sd::SlideshowImpl::startPreview() "
"not allowed on master page!");
return false;
}
@@ -1122,7 +1122,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::startShow(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1185,7 +1185,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::startShowImpl(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1222,7 +1222,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::paint(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1277,7 +1277,7 @@ void SlideshowImpl::removeShapeEvents()
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::removeShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1313,7 +1313,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
catch( Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1393,7 +1393,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1473,7 +1473,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::pause(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1510,7 +1510,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::resume(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -1927,7 +1927,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
+ rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@@ -2059,7 +2059,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
{
bRet = false;
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::keyInput(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -2568,7 +2568,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::createSlideShow(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -2778,7 +2778,7 @@ void SlideshowImpl::resize( const Size& rSize )
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::resize(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -3156,7 +3156,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::setUsePen(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -3194,7 +3194,7 @@ void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (Runtime
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::setUseEraser(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -3505,7 +3505,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::gotoPreviousSlide(), "
"exception caught: ") +
rtl::OUStringToOString(
@@ -3606,7 +3606,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException)
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
(OString("sd::SlideshowImpl::stopSound(), "
"exception caught: ") +
rtl::OUStringToOString(
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index f64b649..f783e97 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -532,7 +532,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(::rtl::OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), "
"exception caught: ") +
::rtl::OUStringToOString(
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 21b5b2a..67b2bee 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -258,7 +258,7 @@ void DrawViewShell::SelectionHasChanged (void)
catch( ::com::sun::star::uno::Exception& e )
{
(void)e;
- DBG_ERROR(
+ OSL_FAIL(
(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), "
"exception caught: ") +
rtl::OUStringToOString(
commit 92f40d4a26c08b91208b2b7738c31bd0f410cf8a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 15:10:02 2011 +0100
Move DBG_ERROR to OSL_FAIL for strings with masked quotation marks
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ecd0492..c8b34ae 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -240,7 +240,7 @@ void SdFileDialog_Imp::CheckSelectionState()
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot access \"selection\" checkbox" );
+ OSL_FAIL( "Cannot access \"selection\" checkbox" );
#endif
}
}
commit a23d405ded973a15085f76f1c9af4a55c22b0dac
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 13:00:33 2011 +0100
Move DBG_ERROR to OSL_FAIL for strings GetBuffer()
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index ccd9843..109560f 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -550,7 +550,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
{
ByteString aTmp( "sd::CustomAnimationPresets::importPresets(), invalid preset id!\n" );
aTmp += ByteString( aMissedPresetIds, RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aTmp.GetBuffer() );
+ OSL_FAIL( aTmp.GetBuffer() );
}
#endif
}
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index a1ac033..7db3405 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -287,7 +287,7 @@ sal_Int32 ReadThroughComponent(
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "SAX parse exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
String sErr( String::CreateFromInt32( r.LineNumber ));
@@ -321,7 +321,7 @@ sal_Int32 ReadThroughComponent(
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "SAX exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
return SD_XML_READERROR;
}
@@ -331,7 +331,7 @@ sal_Int32 ReadThroughComponent(
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "Zip exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
return ERRCODE_IO_BROKENPACKAGE;
}
@@ -341,7 +341,7 @@ sal_Int32 ReadThroughComponent(
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "IO exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
return SD_XML_READERROR;
}
@@ -351,7 +351,7 @@ sal_Int32 ReadThroughComponent(
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "uno exception catched while importing:\n" );
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
return SD_XML_READERROR;
}
@@ -1093,7 +1093,7 @@ sal_Bool SdXMLFilter::Export()
#if OSL_DEBUG_LEVEL > 1
ByteString aError( "uno Exception caught while exporting:\n" );
aError += ByteString( String( e.Message), RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
bDocRet = sal_False;
}
More information about the Libreoffice-commits
mailing list