diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
commit | 257a5147b5728c5cdceb640bef473774f677ab0b (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /slideshow/source/engine/slide/layer.cxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 778c39e45277c821d83039734d1f0d6636870542 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:44 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit a2636e7e8926833cefa3b527dc3a4e3d6d8ffcc7
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:26 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit b2cdf7bfe14ea650e52a4c90aaf5628b193d8509
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:57 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit ed8d7fa8a6f50723b5c2b19e3a9b9df6d014aa68
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:07 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: impress_libreoffice-3.3.1.1
split repo tag: impress_libreoffice-3.3.1.2
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 c345e8012016..b2bca8752385 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -2,7 +2,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 @@ -43,7 +43,7 @@ #include "layer.hxx" #include <boost/bind.hpp> - + using namespace ::com::sun::star; @@ -60,7 +60,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(true), mbClipSet(false) - { + { } Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) : @@ -71,7 +71,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(false), mbClipSet(false) - { + { } ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView ) @@ -80,9 +80,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 ) @@ -98,12 +98,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; } @@ -112,10 +112,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 ) @@ -126,7 +126,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, @@ -141,13 +141,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 @@ -202,7 +202,7 @@ namespace slideshow { // TODO(Q1): move this to B2DMultiRange if( !rUpdateRange.isEmpty() ) - maUpdateAreas.appendElement( rUpdateRange, + maUpdateAreas.appendElement( rUpdateRange, basegfx::ORIENTATION_POSITIVE ); } @@ -212,7 +212,7 @@ namespace slideshow { if( !mbBoundsDirty ) maNewBounds.reset(); - + maNewBounds.expand( rShape->getUpdateArea() ); } @@ -246,7 +246,7 @@ namespace slideshow return true; } - + void Layer::clearUpdateRanges() { maUpdateAreas.clear(); @@ -257,9 +257,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))); @@ -288,12 +288,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. @@ -302,9 +302,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))); @@ -312,9 +312,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))); @@ -334,9 +334,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))); @@ -352,7 +352,7 @@ namespace slideshow LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds ) { - return LayerSharedPtr(new Layer( rMaxLayerBounds, + return LayerSharedPtr(new Layer( rMaxLayerBounds, BackgroundLayer )); } |