diff options
Diffstat (limited to 'slideshow/source/engine/slide/layer.cxx')
-rw-r--r-- | slideshow/source/engine/slide/layer.cxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 65f52f3b823f..a41a000e8c79 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include "layer.hxx" #include <boost/bind.hpp> - + using namespace ::com::sun::star; @@ -59,7 +59,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(true), mbClipSet(false) - { + { } Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) : @@ -70,7 +70,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(false), mbClipSet(false) - { + { } ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView ) @@ -79,9 +79,9 @@ namespace slideshow ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); - if( (aIter=std::find_if( maViewEntries.begin(), + if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rNewView )))) != aEnd ) @@ -97,12 +97,12 @@ namespace slideshow pNewLayer = rNewView; else pNewLayer = rNewView->createViewLayer(maBounds); - + // add to local list - maViewEntries.push_back( - ViewEntry( rNewView, + maViewEntries.push_back( + ViewEntry( rNewView, pNewLayer )); - + return maViewEntries.back().mpViewLayer; } @@ -111,10 +111,10 @@ namespace slideshow OSL_ASSERT( rView ); ViewEntryVector::iterator aIter; - const ViewEntryVector::iterator aEnd( maViewEntries.end() ); + const ViewEntryVector::iterator aEnd( maViewEntries.end() ); if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rView )))) == aEnd ) @@ -125,7 +125,7 @@ namespace slideshow OSL_ENSURE( std::count_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rView ))) == 1, @@ -140,13 +140,13 @@ namespace slideshow void Layer::viewChanged( const ViewSharedPtr& rChangedView ) { ViewEntryVector::iterator aIter; - const ViewEntryVector::iterator aEnd( maViewEntries.end() ); - if( (aIter=std::find_if( maViewEntries.begin(), + const ViewEntryVector::iterator aEnd( maViewEntries.end() ); + if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), - boost::cref( rChangedView )))) != + boost::cref( rChangedView )))) != aEnd ) { // adapt size of given ViewLayer - background layer @@ -201,7 +201,7 @@ namespace slideshow { // TODO(Q1): move this to B2DMultiRange if( !rUpdateRange.isEmpty() ) - maUpdateAreas.appendElement( rUpdateRange, + maUpdateAreas.appendElement( rUpdateRange, basegfx::ORIENTATION_POSITIVE ); } @@ -211,7 +211,7 @@ namespace slideshow { if( !mbBoundsDirty ) maNewBounds.reset(); - + maNewBounds.expand( rShape->getUpdateArea() ); } @@ -245,7 +245,7 @@ namespace slideshow return true; } - + void Layer::clearUpdateRanges() { maUpdateAreas.clear(); @@ -256,9 +256,9 @@ namespace slideshow // clear content on all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::clear, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1))); @@ -287,12 +287,12 @@ namespace slideshow if( maUpdateAreas.count() ) { // perform proper layer update. That means, setup proper - // clipping, and render each shape that intersects with + // clipping, and render each shape that intersects with // the calculated update area ::basegfx::B2DPolyPolygon aClip( maUpdateAreas.solveCrossovers() ); aClip = ::basegfx::tools::stripNeutralPolygons(aClip); aClip = ::basegfx::tools::stripDispensablePolygons(aClip, false); - + // actually, if there happen to be shapes with zero // update area in the maUpdateAreas vector, the // resulting clip polygon will be empty. @@ -301,9 +301,9 @@ namespace slideshow // set clip to all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::setClip, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1), boost::cref(aClip))); @@ -311,9 +311,9 @@ namespace slideshow // clear update area on all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::clear, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1))); @@ -333,9 +333,9 @@ namespace slideshow basegfx::B2DPolyPolygon aEmptyClip; std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::setClip, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1), boost::cref(aEmptyClip))); @@ -351,7 +351,7 @@ namespace slideshow LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds ) { - return LayerSharedPtr(new Layer( rMaxLayerBounds, + return LayerSharedPtr(new Layer( rMaxLayerBounds, BackgroundLayer )); } |