diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 17:39:27 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 17:41:57 +0100 |
| commit | 4d94306389349a57b50523a692f261de7e2489d4 (patch) | |
| tree | 0a7a8ab9dda4ee3cfe51473d45fbeb85af0ff462 /connectivity/source/drivers/ado | |
| parent | c3f695ed034e09014fee0604b749d7da2fb11045 (diff) | |
Port stuff to our private implementation of SGI extensions
Diffstat (limited to 'connectivity/source/drivers/ado')
| -rw-r--r-- | connectivity/source/drivers/ado/AColumn.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/AColumns.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/AConnection.cxx | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index a16747632c8b..7ac506d99cae 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -38,6 +38,8 @@ #include <comphelper/types.hxx> #include "ado/ACatalog.hxx" +#include <o3tl/compat_functional.hxx> + using namespace ::comphelper; using namespace connectivity::ado; @@ -225,11 +227,11 @@ void OAdoColumn::fillPropertyValues() ::comphelper::TStringMixEqualFunctor aCase(sal_False); OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(aCase, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VarBinary"))), - ::std::compose1( + ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), - ::std::select2nd<OTypeInfoMap::value_type>()) + ::o3tl::select2nd<OTypeInfoMap::value_type>()) ) ); diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 377667bc863b..f2b7d0f146c1 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -44,6 +44,8 @@ #endif #include "resource/ado_res.hrc" +#include <o3tl/compat_functional.hxx> + using namespace connectivity::ado; using namespace connectivity; using namespace comphelper; @@ -95,11 +97,11 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc // search for typeinfo where the typename is equal sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(aCase, sTypeName), - ::std::compose1( + ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), - ::std::select2nd<OTypeInfoMap::value_type>()) + ::o3tl::select2nd<OTypeInfoMap::value_type>()) ) ); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 87e7c927a9e9..058ad8094703 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -44,6 +44,8 @@ #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; @@ -605,11 +607,11 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r // search for typeinfo where the typename is equal _sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(aCase, _sTypeName), - ::std::compose1( + ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), - ::std::select2nd<OTypeInfoMap::value_type>()) + ::o3tl::select2nd<OTypeInfoMap::value_type>()) ) ); if(aFind != _rTypeInfo.end()) |