[Libreoffice-commits] .: canvas/source slideshow/source

[Cédric Bosdonnat]

 canvas/source/tools/spriteredrawmanager.cxx  |   21 +++++++++++++++++++--
 slideshow/source/engine/shapes/drawshape.cxx |    1 -
 2 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 7ffe517dea4190334c1ddf376af17ddfc1d3f128
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Thu Nov 3 08:13:08 2011 +0100

    RangeExpander functor removed, but needed in one place.
    
    Added a local class for it: there may be a better fix, but it avoids the
    build to break.
    
    Removed a few remaining includes

diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index 32faba6..730361c 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -36,7 +36,6 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/range/rangeexpander.hxx>
 
 #include <algorithm>
 #include <o3tl/compat_functional.hxx>
@@ -223,6 +222,24 @@ namespace canvas
             SpriteRedrawManager::SpriteConnectedRanges&         mrUpdater;
             const SpriteRedrawManager::VectorOfChangeRecords&   mrChangeContainer;
         };
+
+        class RangeExpander
+        {
+            private:
+                basegfx::B2DRange& mrBounds;
+
+            public:
+                typedef void        result_type;
+
+                RangeExpander( basegfx::B2DRange& rBounds ) : mrBounds( rBounds )
+                {
+                }
+
+                void operator()( const basegfx::B2DRange& rBounds )
+                {
+                    mrBounds.expand( rBounds );
+                }
+        };
     }
 
     void SpriteRedrawManager::setupUpdateAreas( SpriteConnectedRanges& rUpdateAreas ) const
@@ -424,7 +441,7 @@ namespace canvas
         ::basegfx::B2DRange aTrueArea( aBegin->second.getUpdateArea() );
         ::std::for_each( aBegin,
                          aEnd,
-                         ::boost::bind( ::basegfx::B2DRangeExpander(aTrueArea),
+                         ::boost::bind( RangeExpander(aTrueArea),
                                         ::boost::bind( &SpriteInfo::getUpdateArea,
                                                        ::boost::bind( ::o3tl::select2nd<AreaComponent>(),
                                                                       _1 ) ) ) );
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 153ffb2..f4b21a9 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -47,7 +47,6 @@
 #include <vcl/wrkwin.hxx>
 
 #include <basegfx/numeric/ftools.hxx>
-#include <basegfx/range/rangeexpander.hxx>
 
 #include <rtl/math.hxx>