Kaydet (Commit) 7339c360 authored tarafından Daniel Robertson's avatar Daniel Robertson Kaydeden (comit) Noel Grandin

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/17483Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 2660d24a
...@@ -309,7 +309,6 @@ ...@@ -309,7 +309,6 @@
#include <limits> #include <limits>
#include <list> #include <list>
#include <map> #include <map>
#include <o3tl/compat_functional.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
......
...@@ -349,7 +349,6 @@ ...@@ -349,7 +349,6 @@
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <memory> #include <memory>
#include <o3tl/compat_functional.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <com/sun/star/sdb/ErrorCondition.hpp> #include <com/sun/star/sdb/ErrorCondition.hpp>
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
#include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contentidentifier.hxx>
#include <o3tl/compat_functional.hxx>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <o3tl/compat_functional.hxx>
namespace dbaccess namespace dbaccess
{ {
...@@ -204,7 +203,8 @@ namespace dbaccess ...@@ -204,7 +203,8 @@ namespace dbaccess
m_pData->rEventsData.begin(), m_pData->rEventsData.begin(),
m_pData->rEventsData.end(), m_pData->rEventsData.end(),
aNames.getArray(), aNames.getArray(),
::o3tl::select1st< DocumentEventsData::value_type >() []( const ::std::pair< DocumentEventsData::key_type, DocumentEventsData::mapped_type >& cp )
{ return cp.first; }
); );
return aNames; return aNames;
} }
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifiable.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <algorithm> #include <algorithm>
#include <o3tl/compat_functional.hxx>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <limits> #include <limits>
...@@ -1469,7 +1468,8 @@ Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroup ...@@ -1469,7 +1468,8 @@ Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroup
::std::transform( aCmdHashMap.begin(), ::std::transform( aCmdHashMap.begin(),
aCmdHashMap.end(), aCmdHashMap.end(),
aCommandGroups.getArray(), aCommandGroups.getArray(),
::o3tl::select1st< CommandHashMap::value_type >() []( const ::std::pair< CommandHashMap::key_type, CommandHashMap::mapped_type >& cp )
{ return cp.first; }
); );
return aCommandGroups; return aCommandGroups;
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "svtools/treelistentry.hxx" #include "svtools/treelistentry.hxx"
#include <algorithm> #include <algorithm>
#include <o3tl/compat_functional.hxx>
namespace dbaui namespace dbaui
{ {
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <o3tl/compat_functional.hxx>
namespace dbaui namespace dbaui
{ {
...@@ -773,7 +772,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ...@@ -773,7 +772,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
::std::transform(m_aIndirectPropTranslator.begin(), ::std::transform(m_aIndirectPropTranslator.begin(),
m_aIndirectPropTranslator.end(), m_aIndirectPropTranslator.end(),
::std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()), ::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 // now check the to-be-preserved props
::std::vector< sal_Int32 > aRemoveIndexes; ::std::vector< sal_Int32 > aRemoveIndexes;
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "FieldDescriptions.hxx" #include "FieldDescriptions.hxx"
#include "UITools.hxx" #include "UITools.hxx"
#include <unotools/configmgr.hxx> #include <unotools/configmgr.hxx>
#include <o3tl/compat_functional.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <tools/contnr.hxx> #include <tools/contnr.hxx>
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <com/sun/star/sdb/application/CopyTableOperation.hpp> #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
#include "dbustrings.hrc" #include "dbustrings.hrc"
#include <functional> #include <functional>
#include <o3tl/compat_functional.hxx>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#include <vcl/waitobj.hxx> #include <vcl/waitobj.hxx>
#include <functional> #include <functional>
#include <o3tl/compat_functional.hxx>
using namespace ::dbaui; using namespace ::dbaui;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment