[Libreoffice-commits] core.git: canvas/source dbaccess/source reportdesign/source slideshow/source

Thorsten Behrens thb at documentfoundation.org
Fri Dec 5 07:18:27 PST 2014


 canvas/source/cairo/cairo_spritecanvashelper.cxx    |    3 +--
 canvas/source/vcl/spritecanvashelper.cxx            |    4 ++--
 dbaccess/source/ui/tabledesign/TableController.cxx  |    3 +--
 reportdesign/source/core/api/ReportDefinition.cxx   |    3 +--
 slideshow/source/engine/rehearsetimingsactivity.cxx |    3 +--
 slideshow/source/engine/shapes/appletshape.cxx      |    6 ++----
 slideshow/source/engine/shapes/drawshape.cxx        |    3 +--
 slideshow/source/engine/shapes/mediashape.cxx       |    3 +--
 slideshow/source/engine/unoviewcontainer.cxx        |    3 +--
 9 files changed, 11 insertions(+), 20 deletions(-)

New commits:
commit 7d68c0f5ade7b7324b5a2d03bca042019dfd27f5
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Thu Dec 4 20:39:09 2014 +0100

    Slightly less verbose adaptation to boost-1.56.0
    
    This fixes up 45dfbdca6a9afba1a6aef21623ec025ded635a4d
    
    Change-Id: I754fec5c94d51cbae69ad1155f57b0bb53788ba5

diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 741dbb3..3f638a8 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -402,12 +402,11 @@ namespace cairocanvas
         ::basegfx::computeSetDifference( aUncoveredAreas,
                                          rUpdateArea.maTotalBounds,
                                          ::basegfx::B2DRange( rDestRect ) );
-        SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
         ::std::for_each( aUncoveredAreas.begin(),
                          aUncoveredAreas.end(),
                          ::boost::bind( &repaintBackground,
                                         boost::cref(pCompositingCairo),
-                                        boost::cref(surface),
+                                        mpOwningSpriteCanvas->getBufferSurface(),
                                         _1 ) );
 
         cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index a4ad7fa..037bc48 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -573,12 +573,12 @@ namespace vclcanvas
 
         // repaint all affected sprites on top of background into
         // VDev.
-        ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
         ::std::for_each( rSortedUpdateSprites.begin(),
                          rSortedUpdateSprites.end(),
                          ::boost::bind( &spriteRedrawStub2,
                                         ::boost::ref( maVDev.get() ),
-                                        ::boost::cref( outPos ),
+                                        ::vcl::unotools::b2DPointFromPoint(
+                                            aOutputPosition),
                                         _1 ) );
 
         // flush to screen
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 1536dfe..ef36c4d 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1396,8 +1396,7 @@ void OTableController::assignTable()
                     setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
                     if(!isEditable())
                     {
-                        bool t( true );
-                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
+                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, true));
                     }
                     m_bNew = false;
                     // be notified when the table is in disposing
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 6deca0a..3931191 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1622,9 +1622,8 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::X
         m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
     }
     // notify our container listeners
-    OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
     m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
-            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
+            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,static_cast<OWeakObject*>(this),boost::cref(_xStorage)));
 }
 
 uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage(  ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 3add12f..72d6db2 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -400,12 +400,11 @@ void RehearseTimingsActivity::viewsChanged()
     {
         // new sprite pos, transformation might have changed:
         maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
-        ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
 
         // reposition sprites
         for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
                                       _1,
-                                      boost::cref( rectMin )) );
+                                      maSpriteRectangle.getMinimum()) );
 
         // sprites changed, need screen update
         mrScreenUpdater.notifyUpdate();
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 3d784d0..c4aa406 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -148,13 +148,12 @@ namespace slideshow
         void AppletShape::implViewsChanged()
         {
             // resize all ViewShapes
-            ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
             ::std::for_each( maViewAppletShapes.begin(),
                              maViewAppletShapes.end(),
                              ::boost::bind(
                                  &ViewAppletShape::resize,
                                  _1,
-                                 ::boost::cref( bounds )) );
+                                 AppletShape::getBounds()) );
         }
 
 
@@ -253,12 +252,11 @@ namespace slideshow
 
         bool AppletShape::implStartIntrinsicAnimation()
         {
-            ::basegfx::B2DRectangle bounds( getBounds() );
             ::std::for_each( maViewAppletShapes.begin(),
                              maViewAppletShapes.end(),
                              ::boost::bind( &ViewAppletShape::startApplet,
                                             _1,
-                                            ::boost::cref( bounds )));
+                                            getBounds()) );
             mbIsPlaying = true;
 
             return true;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index a3b89b7..d7ef2b4 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -168,7 +168,6 @@ namespace slideshow
             }
 
             // redraw all view shapes, by calling their update() method
-            ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
             if( ::std::count_if( maViewShapes.begin(),
                                  maViewShapes.end(),
                                  ::boost::bind<bool>(
@@ -179,7 +178,7 @@ namespace slideshow
                                                                              // the extra mem_fn. WTF.
                                      _1,
                                      ::boost::cref( mpCurrMtf ),
-                                     ::boost::cref( renderArgs ),
+                                     getViewRenderArgs(),
                                      nUpdateFlags,
                                      isVisible() ) )
                 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index 071fe60..b658e50 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -125,13 +125,12 @@ namespace slideshow
         void MediaShape::implViewsChanged()
         {
             // resize all ViewShapes
-            ::basegfx::B2DRectangle bounds( getBounds() );
             ::std::for_each( maViewMediaShapes.begin(),
                              maViewMediaShapes.end(),
                              ::boost::bind(
                                  &ViewMediaShape::resize,
                                  _1,
-                                 ::boost::cref( bounds )) );
+                                 getBounds()) );
         }
 
 
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 2be436c..f551938 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -47,12 +47,11 @@ namespace slideshow
             const UnoViewVector::iterator aEnd( maViews.end() );
 
             // already added?
-            uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
             if( ::std::find_if( maViews.begin(),
                                 aEnd,
                                 ::boost::bind(
                                     ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
-                                    ::boost::cref( xView ),
+                                    rView->getUnoView(),
                                     ::boost::bind(
                                         &UnoView::getUnoView,
                                         _1 ) ) ) != aEnd )


More information about the Libreoffice-commits mailing list