diff options
author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-08-08 00:06:37 -0400 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-08-11 22:22:05 +0000 |
commit | f6595f0b3389ffeefa10035d915a884b02d26c0e (patch) | |
tree | 773ab4f423f1238c9e4bb8c7c305e0a01feef6de /connectivity | |
parent | 7f3e313307e8c99f719654622c97fb742d728e0f (diff) |
tdf#92459 remove o3tl/compat_functional.hxx
Replace all uses of deprecated features from the o3tl included in
compat_functional.hxx with lambda expressions in connectivity and
reportdesign. The patch should not cause any side effects. The change is
largely cosmetic.
Change-Id: I2042b91bf0fa2b47cce9ea11c97fa4ca6734c5e2
Reviewed-on: https://gerrit.libreoffice.org/17588
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/inc/pch/precompiled_ado.hxx | 1 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_dbtools.hxx | 1 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_odbc.hxx | 1 | ||||
-rw-r--r-- | connectivity/source/commontools/TSortIndex.cxx | 1 | ||||
-rw-r--r-- | connectivity/source/commontools/TTableHelper.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AColumn.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AColumns.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/AConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/HStorageMap.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/odbc/OResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 2 |
12 files changed, 1 insertions, 20 deletions
diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index be53e17d4281..23e8493c6afd 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -53,7 +53,6 @@ #include <cppuhelper/typeprovider.hxx> #include <limits> #include <memory> -#include <o3tl/compat_functional.hxx> #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/thread.h> diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index b6f089582fdf..2bc28f6df7dd 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.hxx @@ -147,7 +147,6 @@ #include <i18nlangtag/mslangid.hxx> #include <iomanip> #include <iterator> -#include <o3tl/compat_functional.hxx> #include <osl/diagnose.h> #include <rtl/digest.h> #include <rtl/math.hxx> diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx index 3881b9d40f54..3cef9db625e8 100644 --- a/connectivity/inc/pch/precompiled_odbc.hxx +++ b/connectivity/inc/pch/precompiled_odbc.hxx @@ -42,7 +42,6 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <o3tl/compat_functional.hxx> #include <osl/diagnose.h> #include <osl/process.h> #include <osl/thread.h> diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index ffe258aaa048..9e3632df113a 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -20,7 +20,6 @@ #include "TSortIndex.hxx" #include <algorithm> #include <iterator> - #include <o3tl/compat_functional.hxx> using namespace connectivity; diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index b77b2de0e929..30c6a1be96e0 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -295,7 +295,7 @@ void OTableHelper::refreshColumns() aSortedColumns.end(), ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ), ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >() - ); + ); } if(m_pColumns) diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 0e91b49e9503..e1a98033a00f 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -27,8 +27,6 @@ #include <comphelper/types.hxx> #include "ado/ACatalog.hxx" -#include <o3tl/compat_functional.hxx> - using namespace ::comphelper; using namespace connectivity::ado; diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 56a253c18399..c19d8a756bd6 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -31,8 +31,6 @@ #include <algorithm> #include "resource/ado_res.hrc" -#include <o3tl/compat_functional.hxx> - using namespace connectivity::ado; using namespace connectivity; using namespace comphelper; diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index f66adbd8baa5..c1d6ee7eb5d0 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -33,8 +33,6 @@ #include <osl/file.hxx> #include "resource/ado_res.hrc" -#include <o3tl/compat_functional.hxx> - using namespace dbtools; using namespace connectivity::ado; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 5ae04b3acd88..02dfb0558661 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -55,8 +55,6 @@ #include <i18nlangtag/languagetag.hxx> #include <tools/diagnose_ex.h> -#include <o3tl/compat_functional.hxx> - #include <boost/scoped_ptr.hpp> diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 321a12942d7b..534b4a4cb284 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -27,9 +27,6 @@ #include <osl/diagnose.h> #include <osl/thread.h> -#include <o3tl/compat_functional.hxx> - - namespace connectivity { diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 5e9c840f456f..f8136680d9cc 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -37,8 +37,6 @@ #include <connectivity/dbexception.hxx> #include "diagnose_ex.h" -#include <o3tl/compat_functional.hxx> - using namespace ::comphelper; using namespace connectivity; using namespace connectivity::odbc; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 4b4ad1be7502..bf4d4df9f4ba 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -36,8 +36,6 @@ #include <iterator> #include <vector> -#include <o3tl/compat_functional.hxx> - namespace drivermanager { |