[Libreoffice-commits] .: sd/source slideshow/source slideshow/test
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Feb 8 09:01:34 PST 2011
sd/source/ui/tools/PropertySet.cxx | 4 ++--
slideshow/source/engine/rehearsetimingsactivity.cxx | 5 +++--
slideshow/source/engine/slide/layermanager.cxx | 6 ++++--
slideshow/source/engine/slide/shapemanagerimpl.cxx | 8 +++++---
slideshow/source/engine/slide/slideimpl.cxx | 6 ++++--
slideshow/source/engine/waitsymbol.cxx | 5 +++--
slideshow/test/testshape.cxx | 6 ++++--
7 files changed, 25 insertions(+), 15 deletions(-)
New commits:
commit c2cc6289baf2154cbb7c4fa88627060793ffb22c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Feb 8 17:39:23 2011 +0100
Port stuff to our private implementation of SGI extensions
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index 4621de8..801a50a 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -31,7 +31,7 @@
#include "tools/PropertySet.hxx"
#include <boost/bind.hpp>
#include <algorithm>
-#include <functional>
+#include <o3tl/compat_functional.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -153,7 +153,7 @@ void SAL_CALL PropertySet::removePropertyChangeListener (
std::compose1(
std::bind1st(std::equal_to<Reference<beans::XPropertyChangeListener> >(),
rxListener),
- std::select2nd<ChangeListenerContainer::value_type>())));
+ o3tl::select2nd<ChangeListenerContainer::value_type>())));
if (iListener != mpChangeListeners->end())
{
mpChangeListeners->erase(iListener);
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index b8a0192..439601c 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -55,6 +55,7 @@
#include "rehearsetimingsactivity.hxx"
#include <boost/bind.hpp>
+#include <o3tl/compat_functional.hxx>
#include <algorithm>
using namespace com::sun::star;
@@ -374,7 +375,7 @@ void RehearseTimingsActivity::viewRemoved( const UnoViewSharedPtr& rView )
std::equal_to<UnoViewSharedPtr>(),
rView,
// select view:
- boost::bind( std::select1st<ViewsVecT::value_type>(), _1 ))),
+ boost::bind( o3tl::select1st<ViewsVecT::value_type>(), _1 ))),
maViews.end() );
}
@@ -389,7 +390,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView )
std::equal_to<UnoViewSharedPtr>(),
rView,
// select view:
- boost::bind( std::select1st<ViewsVecT::value_type>(), _1 ))));
+ boost::bind( o3tl::select1st<ViewsVecT::value_type>(), _1 ))));
OSL_ASSERT( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 0bd52fe..5f85cca 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -40,6 +40,8 @@
#include <boost/bind.hpp>
#include <algorithm>
+#include <o3tl/compat_functional.hxx>
+
#include "layermanager.hxx"
using namespace ::com::sun::star;
@@ -162,7 +164,7 @@ namespace slideshow
std::for_each(maAllShapes.begin(),
maAllShapes.end(),
boost::bind( &Shape::clearAllViewLayers,
- boost::bind( std::select1st<LayerShapeMap::value_type>(),
+ boost::bind( o3tl::select1st<LayerShapeMap::value_type>(),
_1 )));
for (LayerShapeMap::iterator
@@ -272,7 +274,7 @@ namespace slideshow
std::for_each( maAllShapes.begin(),
maAllShapes.end(),
boost::bind(&Shape::render,
- boost::bind( ::std::select1st<LayerShapeMap::value_type>(), _1)) );
+ boost::bind( ::o3tl::select1st<LayerShapeMap::value_type>(), _1)) );
}
void LayerManager::addShape( const ShapeSharedPtr& rShape )
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index bc18568..6d28dee 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -41,6 +41,8 @@
#include <boost/bind.hpp>
+#include <o3tl/compat_functional.hxx>
+
using namespace com::sun::star;
namespace slideshow {
@@ -83,7 +85,7 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted )
this,
boost::cref(xDummyListener),
boost::bind(
- std::select1st<ShapeEventListenerMap::value_type>(),
+ o3tl::select1st<ShapeEventListenerMap::value_type>(),
_1 )));
// clone cursor map
@@ -92,10 +94,10 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted )
boost::bind( &ShapeManagerImpl::cursorChanged,
this,
boost::bind(
- std::select1st<ShapeCursorMap::value_type>(),
+ o3tl::select1st<ShapeCursorMap::value_type>(),
_1 ),
boost::bind(
- std::select2nd<ShapeCursorMap::value_type>(),
+ o3tl::select2nd<ShapeCursorMap::value_type>(),
_1 )));
if( mpLayerManager )
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 95c047b..84b8253 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -75,6 +75,8 @@
#include "event.hxx"
#include "tools.hxx"
+#include <o3tl/compat_functional.hxx>
+
#include <boost/bind.hpp>
#include <iterator>
#include <algorithm>
@@ -619,7 +621,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
rView,
// select view:
boost::bind(
- std::select1st<VectorOfVectorOfSlideBitmaps::value_type>(),
+ o3tl::select1st<VectorOfVectorOfSlideBitmaps::value_type>(),
_1 )))) == aEnd )
{
// corresponding view not found - maybe view was not
@@ -693,7 +695,7 @@ void SlideImpl::viewRemoved( const UnoViewSharedPtr& rView )
rView,
// select view:
boost::bind(
- std::select1st<VectorOfVectorOfSlideBitmaps::value_type>(),
+ o3tl::select1st<VectorOfVectorOfSlideBitmaps::value_type>(),
_1 ))),
aEnd );
}
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index 8e36df4..022ad0e 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -43,6 +43,7 @@
#include "waitsymbol.hxx"
#include "eventmultiplexer.hxx"
+#include <o3tl/compat_functional.hxx>
#include <algorithm>
@@ -165,7 +166,7 @@ void WaitSymbol::viewRemoved( const UnoViewSharedPtr& rView )
std::equal_to<UnoViewSharedPtr>(),
rView,
// select view:
- boost::bind( std::select1st<ViewsVecT::value_type>(), _1 ) ) ),
+ boost::bind( o3tl::select1st<ViewsVecT::value_type>(), _1 ) ) ),
maViews.end() );
}
@@ -180,7 +181,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView )
std::equal_to<UnoViewSharedPtr>(),
rView,
// select view:
- boost::bind( std::select1st<ViewsVecT::value_type>(), _1 ))));
+ boost::bind( o3tl::select1st<ViewsVecT::value_type>(), _1 ))));
OSL_ASSERT( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index e0d290b..12db1dd 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -41,6 +41,8 @@
#include "tests.hxx"
#include "com/sun/star/presentation/XSlideShowView.hpp"
+#include <o3tl/compat_functional.hxx>
+
#include <boost/bind.hpp>
namespace target = slideshow::internal;
@@ -143,7 +145,7 @@ private:
maViewLayers.end(),
boost::bind( std::equal_to< target::ViewLayerSharedPtr >(),
boost::cref( rNewLayer ),
- boost::bind( std::select1st<ViewVector::value_type>(),
+ boost::bind( o3tl::select1st<ViewVector::value_type>(),
_1 ))) == maViewLayers.end() )
throw std::exception();
@@ -153,7 +155,7 @@ private:
maViewLayers.end(),
boost::bind( std::equal_to< target::ViewLayerSharedPtr >(),
boost::cref( rNewLayer ),
- boost::bind( std::select1st<ViewVector::value_type>(),
+ boost::bind( o3tl::select1st<ViewVector::value_type>(),
_1 ))));
return true;
}
More information about the Libreoffice-commits
mailing list