diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 17:39:31 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 17:42:35 +0100 |
| commit | d935718b6ea067fb1e79dbdb2ee91d7e3f640f85 (patch) | |
| tree | 74aed273a70bf525bbd90e11adc5d9de691820bd /canvas | |
| parent | 63ec47e63083642e6630f2dbd2bebe152ab9270a (diff) | |
Port stuff to our private implementation of SGI extensions
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 12 | ||||
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index fb54ae3e8c6c..3ce6cfeacd22 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -47,7 +47,7 @@ #include <boost/bind.hpp> #include <vector> #include <utility> -#include <functional> +#include <o3tl/compat_functional.hxx> #include <algorithm> #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) @@ -270,7 +270,7 @@ Sequence<OUString> CanvasFactory::getAvailableServiceNames() std::transform(m_aAvailableImplementations.begin(), m_aAvailableImplementations.end(), aServiceNames.getArray(), - std::select1st<AvailPair>()); + o3tl::select1st<AvailPair>()); return aServiceNames; } @@ -355,7 +355,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( boost::bind(&OUString::equals, boost::cref(serviceName), boost::bind( - std::select1st<CachePair>(), + o3tl::select1st<CachePair>(), _1)))) != aEnd ) { Reference<XInterface> xCanvas( use( aMatch->second, args, xContext ) ); @@ -371,7 +371,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( boost::bind(&OUString::equals, boost::cref(serviceName), boost::bind( - std::select1st<AvailPair>(), + o3tl::select1st<AvailPair>(), _1)))) == aAvailEnd ) { return Reference<XInterface>(); @@ -384,7 +384,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( boost::bind(&OUString::equals, boost::cref(serviceName), boost::bind( - std::select1st<AvailPair>(), + o3tl::select1st<AvailPair>(), _1)))) == aAAEnd ) { return Reference<XInterface>(); @@ -397,7 +397,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( boost::bind(&OUString::equals, boost::cref(serviceName), boost::bind( - std::select1st<AvailPair>(), + o3tl::select1st<AvailPair>(), _1)))) == aAccelEnd ) { return Reference<XInterface>(); diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index a9984c5b0383..32faba6eaec4 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -39,7 +39,7 @@ #include <basegfx/range/rangeexpander.hxx> #include <algorithm> -#include <functional> +#include <o3tl/compat_functional.hxx> #include <boost/bind.hpp> @@ -426,7 +426,7 @@ namespace canvas aEnd, ::boost::bind( ::basegfx::B2DRangeExpander(aTrueArea), ::boost::bind( &SpriteInfo::getUpdateArea, - ::boost::bind( ::std::select2nd<AreaComponent>(), + ::boost::bind( ::o3tl::select2nd<AreaComponent>(), _1 ) ) ) ); // and check whether _any_ of the sprites tells that its area @@ -452,7 +452,7 @@ namespace canvas aEnd, ::boost::bind( &SpriteInfo::needsUpdate, ::boost::bind( - ::std::select2nd<SpriteConnectedRanges::ComponentType>(), + ::o3tl::select2nd<SpriteConnectedRanges::ComponentType>(), _1 ) ) ) != aEnd ); } |