diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-13 20:54:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-13 21:22:08 +0000 |
| commit | 98f759bec1024d1f4e28b8c1880e542b7832b8fc (patch) | |
| tree | ef3c51f963e80e9b48bb06c5db4e82a9a18137b0 /sdext/source | |
| parent | bc1c92ef41e5f70eee7799d301b54985999482bb (diff) | |
sdext: replace boost::bind
MSVC 2013 with non-debug runtime requires an additional assignment operator
in OUStringBufferAppender.
Change-Id: Ic93fc8d6b1d4760f0eb89e34beb1fcb18e783f73
Reviewed-on: https://gerrit.libreoffice.org/24980
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sdext/source')
| -rw-r--r-- | sdext/source/pdfimport/odf/odfemitter.cxx | 11 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/imagecontainer.cxx | 12 |
2 files changed, 8 insertions, 15 deletions
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index bf1a148f10ea..f28667b914b8 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -25,7 +25,8 @@ #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <boost/bind.hpp> + +#include <comphelper/stl_types.hxx> using namespace com::sun::star; @@ -87,12 +88,8 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) // platforms, and even between different compile-time settings), // sort the attributes. std::sort(aAttributes.begin(), aAttributes.end()); - std::for_each(aAttributes.begin(), - aAttributes.end(), - boost::bind( (OUStringBuffer& (OUStringBuffer::*)(const OUString&)) - (&OUStringBuffer::append), - boost::ref(aElement), - _1 )); + std::copy(aAttributes.begin(), aAttributes.end(), + comphelper::OUStringBufferAppender(aElement)); aElement.append(">"); write(aElement.makeStringAndClear()); diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index a3cd15a9251b..650b58446012 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -30,10 +30,6 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <comphelper/stl_types.hxx> - -#include <boost/bind.hpp> - using namespace com::sun::star; namespace pdfi @@ -126,10 +122,10 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex const beans::PropertyValue* pAry(rEntry.getConstArray()); const sal_Int32 nLen(rEntry.getLength()); const beans::PropertyValue* pValue( - std::find_if(pAry,pAry+nLen, - boost::bind(comphelper::TPropertyValueEqualFunctor(), - _1, - OUString("InputSequence")))); + std::find_if(pAry, pAry+nLen, + [] (beans::PropertyValue const& v) -> bool { + return v.Name == "InputSequence"; + })); OSL_ENSURE( pValue != pAry+nLen, "InputSequence not found" ); |