Kaydet (Commit) 35f4c0d2 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

boost::cref->std::cref

Change-Id: I2a4d2052c48f35d69cea2aed2e98079ad8d98a02
Reviewed-on: https://gerrit.libreoffice.org/21982Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst fdfcb1c8
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/ref.hpp>
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <boost/ref.hpp> #include <functional>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::frame; using namespace ::com::sun::star::frame;
...@@ -379,7 +379,7 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea ...@@ -379,7 +379,7 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea
const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pIter = rArgs.getConstArray();
const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
const beans::PropertyValue* pKeyModifier = ::std::find_if( const beans::PropertyValue* pKeyModifier = ::std::find_if(
pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) ); pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), std::cref( sKeyModifier ) ) );
sal_Int16 nKeyModifier = 0; sal_Int16 nKeyModifier = 0;
if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
{ {
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <vector> #include <vector>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <boost/ref.hpp>
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h> #include <osl/doublecheckedlocking.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <boost/ref.hpp> #include <functional>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vcl/window.hxx> #include <vcl/window.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
...@@ -943,7 +943,7 @@ namespace accessibility ...@@ -943,7 +943,7 @@ namespace accessibility
{ {
const beans::PropertyValue* pItr = aSeq.getConstArray(); const beans::PropertyValue* pItr = aSeq.getConstArray();
const beans::PropertyValue* pEnd = pItr + aSeq.getLength(); const beans::PropertyValue* pEnd = pItr + aSeq.getLength();
const beans::PropertyValue* pFind = ::std::find_if( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), boost::cref( *aItr ) ) ); const beans::PropertyValue* pFind = ::std::find_if( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), std::cref( *aItr ) ) );
if ( pFind != pEnd ) if ( pFind != pEnd )
{ {
aIntersectionVec.push_back( *pFind ); aIntersectionVec.push_back( *pFind );
...@@ -981,7 +981,7 @@ namespace accessibility ...@@ -981,7 +981,7 @@ namespace accessibility
{ {
const beans::PropertyValue* pItr = aIntersectionSeq.getConstArray(); const beans::PropertyValue* pItr = aIntersectionSeq.getConstArray();
const beans::PropertyValue* pEnd = pItr + aIntersectionSeq.getLength(); const beans::PropertyValue* pEnd = pItr + aIntersectionSeq.getLength();
bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), boost::cref( pDefAttr[i] ) ) ); bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), std::cref( pDefAttr[i] ) ) );
if ( bNone && pDefAttr[i].Handle != 0) if ( bNone && pDefAttr[i].Handle != 0)
{ {
aDiffVec.push_back( pDefAttr[i] ); aDiffVec.push_back( pDefAttr[i] );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment