diff options
Diffstat (limited to 'slideshow/source/engine/slide')
| -rw-r--r-- | slideshow/source/engine/slide/layermanager.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.cxx | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index a0c53b948862..7f25df5715a8 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -149,7 +149,7 @@ namespace slideshow // sprites std::for_each( maAllShapes.begin(), maAllShapes.end(), - []( const ::std::pair< ShapeSharedPtr, LayerWeakPtr >& cp ) + []( const LayerShapeMap::value_type& cp ) { cp.first->clearAllViewLayers(); } ); for (LayerShapeMap::iterator @@ -258,7 +258,7 @@ namespace slideshow // render all shapes std::for_each( maAllShapes.begin(), maAllShapes.end(), - []( const ::std::pair< ShapeSharedPtr, LayerWeakPtr >& cp ) + []( const LayerShapeMap::value_type& cp ) { cp.first->render(); } ); } diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 796f1ce34124..a74253f647d4 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -66,15 +66,13 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted ) uno::Reference<presentation::XShapeEventListener> xDummyListener; std::for_each( mrGlobalListenersMap.begin(), mrGlobalListenersMap.end(), - [&xDummyListener, this]( const ::std::pair< ShapeEventListenerMap::key_type, - ShapeEventListenerMap::mapped_type >& cp ) + [&xDummyListener, this]( const ShapeEventListenerMap::value_type& cp ) { this->listenerAdded(xDummyListener, cp.first); } ); // clone cursor map std::for_each( mrGlobalCursorMap.begin(), mrGlobalCursorMap.end(), - [this]( const ::std::pair< ShapeCursorMap::key_type, - ShapeCursorMap::mapped_type >& cp ) + [this]( const ShapeCursorMap::value_type& cp ) { this->cursorChanged(cp.first, cp.second); } ); if( mpLayerManager ) diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 3972d5bad809..0d26285a5aec 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -581,7 +581,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r if( (aIter=std::find_if( maSlideBitmaps.begin(), aEnd, [&rView] - ( const ::std::pair< UnoViewSharedPtr, VectorOfSlideBitmaps >& cp ) + ( const VectorOfVectorOfSlideBitmaps::value_type& cp ) { return rView == cp.first; } ) ) == aEnd ) { // corresponding view not found - maybe view was not @@ -651,7 +651,7 @@ void SlideImpl::viewRemoved( const UnoViewSharedPtr& rView ) std::remove_if( maSlideBitmaps.begin(), aEnd, [&rView] - ( const ::std::pair< UnoViewSharedPtr, VectorOfSlideBitmaps >& cp ) + ( const VectorOfVectorOfSlideBitmaps::value_type& cp ) { return rView == cp.first; } ), aEnd ); } |