Port stuff to our private implementation of SGI extensions

6 files changed, 23 insertions, 13 deletions

diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index f8b124676065..c98d34afae17 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 30ceea4b98cd..bf05913b56cc 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 077c98e72060..7ad4f14c5e17 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 690b601c13ad..c644a0016cc4 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 aa472e363cc2..3b834b1d1e60 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 9bf39cc0ce8a..4bd7b934ff6e 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;
     }