[Libreoffice-commits] core.git: chart2/inc chart2/source editeng/inc editeng/source
Noel Grandin
noel at peralex.com
Mon Feb 1 11:01:01 UTC 2016
chart2/inc/pch/precompiled_chartcontroller.hxx | 1 -
chart2/source/controller/main/DrawCommandDispatch.cxx | 4 ++--
editeng/inc/pch/precompiled_editeng.hxx | 1 -
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 6 +++---
4 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 35f4c0d24208385a3fc26c63dd2202e1211844b4
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 1 10:38:59 2016 +0200
boost::cref->std::cref
Change-Id: I2a4d2052c48f35d69cea2aed2e98079ad8d98a02
Reviewed-on: https://gerrit.libreoffice.org/21982
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 0da4c04..8206c33 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -58,7 +58,6 @@
#include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp>
#include <boost/optional.hpp>
-#include <boost/ref.hpp>
#include <boost/shared_array.hpp>
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 5c72097..4ae7d1b 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -43,7 +43,7 @@
#include <svx/xtable.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <boost/ref.hpp>
+#include <functional>
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -379,7 +379,7 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea
const beans::PropertyValue* pIter = rArgs.getConstArray();
const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
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;
if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
{
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index f9498b1..7945aba 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -51,7 +51,6 @@
#include <vector>
#include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp>
-#include <boost/ref.hpp>
#include <boost/shared_array.hpp>
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 08da4ee..f21f63a 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -28,7 +28,7 @@
#include <utility>
#include <vector>
#include <algorithm>
-#include <boost/ref.hpp>
+#include <functional>
#include <osl/mutex.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
@@ -943,7 +943,7 @@ namespace accessibility
{
const beans::PropertyValue* pItr = aSeq.getConstArray();
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 )
{
aIntersectionVec.push_back( *pFind );
@@ -981,7 +981,7 @@ namespace accessibility
{
const beans::PropertyValue* pItr = aIntersectionSeq.getConstArray();
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)
{
aDiffVec.push_back( pDefAttr[i] );
More information about the Libreoffice-commits
mailing list