[Libreoffice-commits] core.git: include/comphelper sdext/source

[Michael Stahl]

 include/comphelper/stl_types.hxx               |    4 ++++
 sdext/source/pdfimport/odf/odfemitter.cxx      |   11 ++++-------
 sdext/source/pdfimport/tree/imagecontainer.cxx |   12 ++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 98f759bec1024d1f4e28b8c1880e542b7832b8fc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 13 20:54:42 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index acfc419..594d688 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -162,6 +162,10 @@ public:
 
     OUStringBufferAppender(OUStringBuffer & i_rBuffer)
         : m_rBuffer(i_rBuffer) { }
+    Self & operator=(Self const &)
+    {   // MSVC 2013 with non-debug runtime requires this in xutility.hpp:289
+        return *this;
+    }
     Self & operator=(OUString const & i_rStr)
     {
         m_rBuffer.append( i_rStr );
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index bf1a148..f28667b 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 a3cd15a..650b584 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" );