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

[Daniel Robertson]

 dbaccess/inc/pch/precompiled_dba.hxx                    |    1 -
 dbaccess/inc/pch/precompiled_dbu.hxx                    |    1 -
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |    1 -
 dbaccess/source/core/dataaccess/documentevents.cxx      |    4 ++--
 dbaccess/source/ui/browser/genericcontroller.cxx        |    4 ++--
 dbaccess/source/ui/control/tabletree.cxx                |    1 -
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                  |    4 ++--
 dbaccess/source/ui/misc/DExport.cxx                     |    1 -
 dbaccess/source/ui/misc/WColumnSelect.cxx               |    1 -
 dbaccess/source/ui/misc/WCopyTable.cxx                  |    1 -
 10 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 7339c360ef55fdde99907e1e34a231386ebc534e
Author: Daniel Robertson <danlrobertson89 at gmail.com>
Date:   Sun Aug 2 20:12:35 2015 -0400

    tdf92459 replace select1st/2nd in dbaccess
    
    Replace all uses of deprecated features in the o3tl with lambda
    expressions in dbaccess.
    
    Change-Id: I865bb5db5257e985a0eed0110874d6b29892fcfb
    Reviewed-on: https://gerrit.libreoffice.org/17483
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index d097d79..0e5c763 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -309,7 +309,6 @@
 #include <limits>
 #include <list>
 #include <map>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 89f563b..9a4fa62 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -349,7 +349,6 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <o3tl/compat_functional.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index e9034ce..6e0c781 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <comphelper/types.hxx>
 #include <ucbhelper/contentidentifier.hxx>
-#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 40c0d18..9966a23 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -26,7 +26,6 @@
 
 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
 
 namespace dbaccess
 {
@@ -204,7 +203,8 @@ namespace dbaccess
             m_pData->rEventsData.begin(),
             m_pData->rEventsData.end(),
             aNames.getArray(),
-            ::o3tl::select1st< DocumentEventsData::value_type >()
+            []( const ::std::pair< DocumentEventsData::key_type, DocumentEventsData::mapped_type >& cp )
+            { return cp.first; }
         );
         return aNames;
     }
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 3f7d765..df4066e 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <rtl/ustring.hxx>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <limits>
@@ -1469,7 +1468,8 @@ Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroup
     ::std::transform( aCmdHashMap.begin(),
         aCmdHashMap.end(),
         aCommandGroups.getArray(),
-        ::o3tl::select1st< CommandHashMap::value_type >()
+        []( const ::std::pair< CommandHashMap::key_type, CommandHashMap::mapped_type >& cp )
+        { return cp.first; }
     );
 
     return aCommandGroups;
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index d243412..5d5ec4c 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -45,7 +45,6 @@
 #include "svtools/treelistentry.hxx"
 
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 97c6452..03c30af 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -70,7 +70,6 @@
 
 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
 
 namespace dbaui
 {
@@ -773,7 +772,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
         ::std::transform(m_aIndirectPropTranslator.begin(),
                          m_aIndirectPropTranslator.end(),
                          ::std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()),
-                         ::o3tl::select2nd<MapInt2String::value_type>());
+                         []( const ::std::pair< MapInt2String::key_type, MapInt2String::mapped_type >& cp )
+                         { return cp.second; });
 
         // now check the to-be-preserved props
         ::std::vector< sal_Int32 > aRemoveIndexes;
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index fbdeab6..81f6531 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -45,7 +45,6 @@
 #include "FieldDescriptions.hxx"
 #include "UITools.hxx"
 #include <unotools/configmgr.hxx>
-#include <o3tl/compat_functional.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/contnr.hxx>
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index ff363f9..9904a6e 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
 #include "dbustrings.hrc"
 #include <functional>
-#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index a629a8d..1e28171 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -61,7 +61,6 @@
 #include <vcl/waitobj.hxx>
 
 #include <functional>
-#include <o3tl/compat_functional.hxx>
 
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;