diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-02-03 16:13:58 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-02-03 23:43:33 +0100 |
commit | 0fadfd3c17a4ec9bd3e51deb22074422e1b4c330 (patch) | |
tree | d8769922bd3f674f438f6550cf2c45e8d6eab8cf /sc | |
parent | 1fe41c378fdc3261fb86f3abeb93c7d918c74fb5 (diff) |
sc: replace boost::bind with C++11 lambda
Change-Id: I516ffb7510f52cceff0cae6970c6ab699a7889be
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 1 | ||||
-rw-r--r-- | sc/inc/pch/precompiled_scfilt.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/userlist.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/lotus/lotattr.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/ScPanelFactory.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/fmtuno.cxx | 8 |
8 files changed, 7 insertions, 14 deletions
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index ed95b2d3e7e0..c73aa98462b9 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -56,7 +56,6 @@ #include <unordered_set> #include <utility> #include <vector> -#include <boost/bind.hpp> #include <boost/checked_delete.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/math/special_functions/log1p.hpp> diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index 8feccbbe466a..655f61076c09 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -48,7 +48,6 @@ #include <unordered_set> #include <utility> #include <vector> -#include <boost/bind.hpp> #include <boost/checked_delete.hpp> #include <boost/noncopyable.hpp> #include <boost/optional/optional.hpp> diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 39344a96e9b0..b9206f4482bd 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -26,7 +26,6 @@ #include <unotools/transliterationwrapper.hxx> #include <o3tl/make_unique.hxx> -#include <boost/bind.hpp> #include <algorithm> namespace { @@ -338,7 +337,9 @@ bool ScUserList::operator!=( const ScUserList& r ) const bool ScUserList::HasEntry( const OUString& rStr ) const { - return ::std::any_of(maData.begin(), maData.end(), ::boost::bind(&ScUserListData::GetString, _1) == rStr); + return ::std::any_of(maData.begin(), maData.end(), + [&] (std::unique_ptr<ScUserListData> const& pData) + { return pData->GetString() == rStr; } ); } ScUserList::iterator ScUserList::begin() diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index d14e1f608e88..b5e7e1b9ede5 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -21,8 +21,6 @@ #include "excimp8.hxx" -#include <boost/bind.hpp> - #include <scitems.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 974267c4a11f..23b4c5d10e63 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -19,8 +19,6 @@ #include "lotattr.hxx" -#include <boost/bind.hpp> - #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/justifyitem.hxx> diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 23ba189bf18b..4623c244cef6 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -33,7 +33,6 @@ #include <editeng/lineitem.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <boost/bind.hpp> #include <svx/sidebar/PopupContainer.hxx> #include "CellLineStyleControl.hxx" #include "CellLineStylePopup.hxx" diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index fb46432fb744..9e584d896602 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> -#include <boost/bind.hpp> using namespace css; using namespace css::uno; diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 4a66d9f712f3..1c83d4a5b353 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/bind.hpp> - #include <vcl/svapp.hxx> #include <comphelper/servicehelper.hxx> @@ -231,7 +229,9 @@ void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat, ScTableConditionalFormat::~ScTableConditionalFormat() { - std::for_each(aEntries.begin(),aEntries.end(),boost::bind(&ScTableConditionalEntry::release,_1)); + std::for_each(aEntries.begin(), aEntries.end(), + [] (ScTableConditionalEntry *const pEntry) { pEntry->release(); } ); + } void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem& aEntry) @@ -362,7 +362,7 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std { SolarMutexGuard aGuard; std::for_each(aEntries.begin(),aEntries.end(), - boost::bind(&ScTableConditionalEntry::release,_1)); + [] (ScTableConditionalEntry *const pEntry) { pEntry->release(); } ); aEntries.clear(); } |