diff options
Diffstat (limited to 'slideshow/source/engine')
19 files changed, 58 insertions, 58 deletions
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index aee2b31e5b66..31b6854091f3 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -78,7 +78,7 @@ namespace slideshow if( !isActive() ) return false; // no, early exit. - assert( ! mbFirstPerformCall ); + OSL_ASSERT( ! mbFirstPerformCall ); return true; } diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index d293a2ca4a79..83f72a96b457 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -119,10 +119,10 @@ bool BaseContainerNode::isChildNode( AnimationNodeSharedPtr const& pNode ) const bool BaseContainerNode::notifyDeactivatedChild( AnimationNodeSharedPtr const& pChildNode ) { - assert( pChildNode->getState() == FROZEN || + OSL_ASSERT( pChildNode->getState() == FROZEN || pChildNode->getState() == ENDED ); // early exit on invalid nodes - assert( getState() != INVALID ); + OSL_ASSERT( getState() != INVALID ); if( getState() == INVALID ) return false; @@ -132,7 +132,7 @@ bool BaseContainerNode::notifyDeactivatedChild( } std::size_t const nSize = maChildren.size(); - assert( mnFinishedChildren < nSize ); + OSL_ASSERT( mnFinishedChildren < nSize ); ++mnFinishedChildren; bool bFinished = (mnFinishedChildren >= nSize); diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 6d1ea6a1b441..7a7f63518c32 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -301,7 +301,7 @@ public: void clear() { if (meToState != INVALID) { - assert( (mpNode->meCurrentStateTransition & meToState) != 0 ); + OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 ); mpNode->meCurrentStateTransition &= ~meToState; meToState = INVALID; } @@ -432,7 +432,7 @@ bool BaseNode::resolve() if (! checkValidNode()) return false; - assert( meCurrState != RESOLVED ); + OSL_ASSERT( meCurrState != RESOLVED ); if (inStateOrTransition( RESOLVED )) return true; @@ -495,7 +495,7 @@ void BaseNode::activate() if (! checkValidNode()) return; - assert( meCurrState != ACTIVE ); + OSL_ASSERT( meCurrState != ACTIVE ); if (inStateOrTransition( ACTIVE )) return; @@ -551,7 +551,7 @@ void BaseNode::deactivate() if (inStateOrTransition( ENDED | FROZEN ) || !checkValidNode()) return; - if (isTransition( meCurrState, FROZEN, false /* no assert */ )) { + if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) { // do transition to FROZEN: StateTransition st(this); if (st.enter( FROZEN, StateTransition::FORCE )) { @@ -612,7 +612,7 @@ void BaseNode::end() void BaseNode::notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) { (void) rNotifier; // avoid warning - assert( rNotifier->getState() == FROZEN || + OSL_ASSERT( rNotifier->getState() == FROZEN || rNotifier->getState() == ENDED ); // TODO(F1): for end sync functionality, this might indeed be used some day } diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index aec8432e1a0b..68bda1a56999 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -113,9 +113,9 @@ void SequentialTimeContainer::notifyDeactivating( if (notifyDeactivatedChild( rNotifier )) return; - assert( mnFinishedChildren < maChildren.size() ); + OSL_ASSERT( mnFinishedChildren < maChildren.size() ); AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren]; - assert( pNextChild->getState() == UNRESOLVED ); + OSL_ASSERT( pNextChild->getState() == UNRESOLVED ); if (! resolveChild( pNextChild )) { // could not resolve child - since we risk to diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx index 131630488288..78dd0350d4ba 100644 --- a/slideshow/source/engine/delayevent.cxx +++ b/slideshow/source/engine/delayevent.cxx @@ -26,7 +26,7 @@ namespace internal { bool Delay::fire() { - assert( isCharged() ); + OSL_ASSERT( isCharged() ); if (isCharged()) { mbWasFired = true; maFunc(); diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index a318d9c2d9b7..96ba0e048281 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -164,7 +164,7 @@ bool EffectRewinder::rewind ( // Do not allow nested rewinds. if (mpAsynchronousRewindEvent) { - assert( ! mpAsynchronousRewindEvent); + OSL_ASSERT( ! mpAsynchronousRewindEvent); return false; } @@ -177,7 +177,7 @@ bool EffectRewinder::rewind ( { if ( ! rPreviousSlideFunctor) { - assert(rPreviousSlideFunctor); + OSL_ASSERT(rPreviousSlideFunctor); return false; } @@ -216,7 +216,7 @@ void EffectRewinder::skipAllMainSequenceEffects() // Do not allow nested rewinds. if (mpAsynchronousRewindEvent) { - assert(!mpAsynchronousRewindEvent); + OSL_ASSERT(!mpAsynchronousRewindEvent); return; } @@ -330,7 +330,7 @@ void EffectRewinder::asynchronousRewind ( const bool bRedisplayCurrentSlide, const std::function<void ()>& rSlideRewindFunctor) { - assert(mpAsynchronousRewindEvent); + OSL_ASSERT(mpAsynchronousRewindEvent); if (bRedisplayCurrentSlide) { @@ -372,7 +372,7 @@ void EffectRewinder::asynchronousRewind ( void EffectRewinder::asynchronousRewindToPreviousSlide ( const ::std::function<void ()>& rSlideRewindFunctor) { - assert(mpAsynchronousRewindEvent); + OSL_ASSERT(mpAsynchronousRewindEvent); mpAsynchronousRewindEvent.reset(); rSlideRewindFunctor(); diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index ffe37a16d266..c707af32e91e 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -411,7 +411,7 @@ void EventMultiplexerImpl::forEachView( XSlideShowViewFunc pViewMethod ) } else { - assert(xView.is()); + OSL_ASSERT(xView.is()); } } } diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 6f53bbd7e272..2b50addcd71c 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -155,7 +155,7 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr& rView ) ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index c3945fe8b0b3..861edc70144e 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -371,7 +371,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; @@ -467,7 +467,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) cppcanvas::VCLFactory::createRenderer( canvas, metaFile, cppcanvas::Renderer::Parameters() ) ); const bool succ = renderer->draw(); - assert( succ ); + OSL_ASSERT( succ ); (void)succ; } diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 5616f8e1ac4c..597da9daf600 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -198,12 +198,12 @@ namespace internal void ScreenUpdater::lockUpdates() { ++mpImpl->mnLockCount; - assert(mpImpl->mnLockCount>0); + OSL_ASSERT(mpImpl->mnLockCount>0); } void ScreenUpdater::unlockUpdates() { - assert(mpImpl->mnLockCount>0); + OSL_ASSERT(mpImpl->mnLockCount>0); if (mpImpl->mnLockCount > 0) { --mpImpl->mnLockCount; diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 7fdbc2f3a8fb..d4941f8300cf 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -581,7 +581,7 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime) void ActivityImpl::updateShapeAttributes( double fTime, basegfx::B2DRectangle const& parentBounds ) { - assert( meAnimKind != drawing::TextAnimationKind_NONE ); + OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); if( meAnimKind == drawing::TextAnimationKind_NONE ) return; @@ -780,7 +780,7 @@ ActivityImpl::ActivityImpl( uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW ); getPropertyValue( meAnimKind, xProps, "TextAnimationKind" ); - assert( meAnimKind != drawing::TextAnimationKind_NONE ); + OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE); mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index dfb7b89b892d..98f1cae40ac7 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -525,7 +525,7 @@ namespace slideshow if( pShape->hasIntrinsicAnimation() ) { - assert( pShape->maAnimationFrames.empty() ); + OSL_ASSERT( pShape->maAnimationFrames.empty() ); if( pShape->getNumberOfTreeNodes( DocTreeNode::NodeType::LogicalParagraph) > 0 ) { @@ -557,7 +557,7 @@ namespace slideshow if( pShape->hasIntrinsicAnimation() ) { - assert( !pShape->maAnimationFrames.empty() ); + OSL_ASSERT( !pShape->maAnimationFrames.empty() ); std::vector<double> aTimeout; std::transform( @@ -900,7 +900,7 @@ namespace slideshow maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } - assert( maHyperlinkIndices.size() == maHyperlinkRegions.size()); + OSL_ASSERT( maHyperlinkIndices.size() == maHyperlinkRegions.size()); } bool DrawShape::hasHyperlinks() const @@ -910,7 +910,7 @@ namespace slideshow HyperlinkArea::HyperlinkRegions DrawShape::getHyperlinkRegions() const { - assert( !maViewShapes.empty() ); + OSL_ASSERT( !maViewShapes.empty() ); if( !isVisible() ) return HyperlinkArea::HyperlinkRegions(); @@ -934,7 +934,7 @@ namespace slideshow pViewShape->getRenderer( pCanvas, mpCurrMtf, mpAttributeLayer ) ); - assert( pRenderer ); + OSL_ASSERT( pRenderer ); if (pRenderer) { diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 5229d1190d69..0aa3352192a8 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -56,7 +56,7 @@ namespace slideshow ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView ) { - assert( rNewView ); + OSL_ASSERT( rNewView ); ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); @@ -87,7 +87,7 @@ namespace slideshow ViewLayerSharedPtr Layer::removeView( const ViewSharedPtr& rView ) { - assert( rView ); + OSL_ASSERT( rView ); ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 0ccbb62e5562..e3c024398f6f 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -134,13 +134,13 @@ namespace slideshow mbActive = false; // only background layer left - assert( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() ); + OSL_ASSERT( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() ); } void LayerManager::viewAdded( const UnoViewSharedPtr& rView ) { // view must be member of mrViews container - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) != mrViews.end() ); @@ -164,7 +164,7 @@ namespace slideshow void LayerManager::viewRemoved( const UnoViewSharedPtr& rView ) { // view must not be member of mrViews container anymore - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) == mrViews.end() ); @@ -186,7 +186,7 @@ namespace slideshow (void)rView; // view must be member of mrViews container - assert( std::find(mrViews.begin(), + OSL_ASSERT( std::find(mrViews.begin(), mrViews.end(), rView) != mrViews.end() ); @@ -212,7 +212,7 @@ namespace slideshow void LayerManager::addShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" ); // add shape to XShape hash map @@ -237,12 +237,12 @@ namespace slideshow void LayerManager::implAddShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::implAddShape(): invalid Shape" ); LayerShapeMap::value_type aValue (rShape, LayerWeakPtr()); - assert( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already + OSL_ASSERT( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already mbLayerAssociationDirty = true; if( mbDisableAnimationZOrder ) @@ -258,7 +258,7 @@ namespace slideshow void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::implRemoveShape(): invalid Shape" ); const LayerShapeMap::iterator aShapeEntry( maAllShapes.find(rShape) ); @@ -307,7 +307,7 @@ namespace slideshow AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, const DocTreeNode& rTreeNode ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer AttributableShapeSharedPtr pSubset; @@ -338,11 +338,11 @@ namespace slideshow void LayerManager::revokeSubset( const AttributableShapeSharedPtr& rOrigShape, const AttributableShapeSharedPtr& rSubsetShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer if( rOrigShape->revokeSubset( rSubsetShape ) ) { - assert( maAllShapes.find(rSubsetShape) != maAllShapes.end() ); + OSL_ASSERT( maAllShapes.find(rSubsetShape) != maAllShapes.end() ); implRemoveShape( rSubsetShape ); @@ -355,7 +355,7 @@ namespace slideshow void LayerManager::enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::enterAnimationMode(): invalid Shape" ); const bool bPrevAnimState( rShape->isBackgroundDetached() ); @@ -638,7 +638,7 @@ namespace slideshow void LayerManager::addUpdateArea( ShapeSharedPtr const& rShape ) { - assert( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( !maLayers.empty() ); // always at least background layer ENSURE_OR_THROW( rShape, "LayerManager::addUpdateArea(): invalid Shape" ); const LayerShapeMap::const_iterator aShapeEntry( maAllShapes.find(rShape) ); @@ -682,7 +682,7 @@ namespace slideshow LayerSharedPtr LayerManager::createForegroundLayer() const { - assert( mbActive ); + OSL_ASSERT( mbActive ); LayerSharedPtr pLayer( Layer::createLayer() ); @@ -696,8 +696,8 @@ namespace slideshow void LayerManager::updateShapeLayers( bool bBackgroundLayerPainted ) { - assert( !maLayers.empty() ); // always at least background layer - assert( mbActive ); + OSL_ASSERT( !maLayers.empty() ); // always at least background layer + OSL_ASSERT( mbActive ); // do we need to process shapes? if( !mbLayerAssociationDirty ) @@ -762,7 +762,7 @@ namespace slideshow } } - assert( maLayers.size() == aWeakLayers.size() ); + OSL_ASSERT( maLayers.size() == aWeakLayers.size() ); // note: using indices here, since vector::insert // above invalidates iterators diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 571725304e4b..8e8023e0146f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -923,7 +923,7 @@ SlideSharedPtr SlideShowImpl::makeSlide( void SlideShowImpl::requestWaitSymbol() { ++mnWaitSymbolRequestCount; - assert(mnWaitSymbolRequestCount>0); + OSL_ASSERT(mnWaitSymbolRequestCount>0); if (mnWaitSymbolRequestCount == 1) { @@ -940,7 +940,7 @@ void SlideShowImpl::requestWaitSymbol() void SlideShowImpl::releaseWaitSymbol() { --mnWaitSymbolRequestCount; - assert(mnWaitSymbolRequestCount>=0); + OSL_ASSERT(mnWaitSymbolRequestCount>=0); if (mnWaitSymbolRequestCount == 0) { @@ -1099,7 +1099,7 @@ void SlideShowImpl::displaySlide( else mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode ); - assert( mpCurrentSlide ); + OSL_ASSERT( mpCurrentSlide ); if (mpCurrentSlide) { basegfx::B2DSize oldSlideSize; @@ -2279,7 +2279,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) // save time at current drawpage: uno::Reference<beans::XPropertySet> xPropSet( mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY ); - assert( xPropSet.is() ); + OSL_ASSERT( xPropSet.is() ); if (xPropSet.is()) { xPropSet->setPropertyValue( diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 9620ab7b4c08..4d13d8b1d05f 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -1021,7 +1021,7 @@ void SlideView::disposing( lang::EventObject const& evt ) if (mxView.is()) { - assert( evt.Source == mxView ); + OSL_ASSERT( evt.Source == mxView ); mxView.clear(); } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 1f10a158c2f7..cdc1d22134c8 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -308,7 +308,7 @@ bool SlideChangeBase::operator()( double nValue ) // between different canvases! // render the content - assert( getLeavingBitmap( rViewEntry ) ); + OSL_ASSERT( getLeavingBitmap( rViewEntry ) ); if( getLeavingBitmap( rViewEntry ) ) getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas ); } @@ -430,7 +430,7 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView ) [rView]( const ViewEntry& rViewEntry ) { return rView == rViewEntry.getView(); } ) ); - assert( aModifiedEntry != maViewData.end() ); + OSL_ASSERT( aModifiedEntry != maViewData.end() ); if( aModifiedEntry == maViewData.end() ) return; diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index c38623780081..99b34d5d3af6 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -196,7 +196,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon res; if (m_diagonal) { - assert( m_opposite ); + OSL_ASSERT( m_opposite ); ::basegfx::B2DPolyPolygon half( calcHalfDiagonalSnake( t, false /* out */ ) ); // flip on x axis and rotate 90 degrees: diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index eea386f32284..e278d609c464 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -159,7 +159,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView ) ( const ViewsVecT::value_type& cp ) { return rView == cp.first; } ) ); - assert( aModifiedEntry != maViews.end() ); + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; |