[Libreoffice-commits] core.git: dbaccess/source

Michael Stahl mstahl at redhat.com
Mon Apr 18 08:42:48 UTC 2016


 dbaccess/source/core/api/RowSet.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 29ad0f5d16c9f27fa3d12c3d1337a70cec976bbb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Apr 15 16:30:34 2016 +0200

    dbaccess: replace boost::bind with C++11 lambdas
    
    Change-Id: I84d7e2e3b00985815fb1945fbaf87cf5944bd8e6
    Reviewed-on: https://gerrit.libreoffice.org/24116
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 1016977..97dbc1a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -21,7 +21,6 @@
 
 #include <map>
 #include <utility>
-#include <boost/bind.hpp>
 
 #include <string.h>
 #include "RowSet.hxx"
@@ -1889,7 +1888,9 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                                                                             m_xActiveConnection->getMetaData(),
                                                                             aDescription,
                                                                             OUString(),
-                                                                            boost::bind(&ORowSet::getInsertValue, this, _1));
+                            [this] (sal_Int32 const column) -> ORowSetValue const& {
+                                return this->getInsertValue(column);
+                            });
                         aColumnMap.insert(std::make_pair(sName,0));
                         aColumns->get().push_back(pColumn);
                         pColumn->setName(sName);
@@ -1991,7 +1992,9 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                                                                         m_xActiveConnection->getMetaData(),
                                                                         aDescription,
                                                                         sParseLabel,
-                                                                        boost::bind(&ORowSet::getInsertValue, this, _1));
+                        [this] (sal_Int32 const column) -> ORowSetValue const& {
+                            return this->getInsertValue(column);
+                        });
                     aColumns->get().push_back(pColumn);
 
                     pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,makeAny(rKeyColumns.find(i) != rKeyColumns.end()));
@@ -2820,7 +2823,9 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
                                                                 rParent.m_xActiveConnection->getMetaData(),
                                                                 aDescription,
                                                                 sParseLabel,
-                                                                boost::bind(&ORowSetClone::getValue, this, _1));
+                [this] (sal_Int32 const column) -> ORowSetValue const& {
+                    return this->getValue(column);
+                });
             aColumns->get().push_back(pColumn);
             pColumn->setName(*pIter);
             aNames.push_back(*pIter);


More information about the Libreoffice-commits mailing list