From 15c6c2085a8261e2c4ac86d6862d1947894411e0 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 8 Feb 2011 19:44:44 +0100 Subject: more std:: -> o3tl:: build fixes --- dbaccess/source/core/dataaccess/definitioncontainer.cxx | 9 +++++---- dbaccess/source/core/dataaccess/documentevents.cxx | 3 ++- dbaccess/source/ui/browser/genericcontroller.cxx | 3 ++- dbaccess/source/ui/control/tabletree.cxx | 5 +++-- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 4 +++- dbaccess/source/ui/misc/DExport.cxx | 3 ++- dbaccess/source/ui/misc/WColumnSelect.cxx | 7 ++++--- dbaccess/source/ui/misc/WCopyTable.cxx | 7 ++++--- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 5f94fa1ddb81..cb0153bef651 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -47,6 +47,7 @@ #include #include #include +#include using namespace ::com::sun::star::uno; @@ -79,9 +80,9 @@ ODefinitionContainer_Impl::const_iterator ODefinitionContainer_Impl::find( TCont return ::std::find_if( m_aDefinitions.begin(), m_aDefinitions.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd( ::std::equal_to< TContentPtr >(), _pDefinition ), - ::std::select2nd< NamedDefinitions::value_type >() + ::o3tl::select2nd< NamedDefinitions::value_type >() ) ); } @@ -91,9 +92,9 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr return ::std::find_if( m_aDefinitions.begin(), m_aDefinitions.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd( ::std::equal_to< TContentPtr >(), _pDefinition ), - ::std::select2nd< NamedDefinitions::value_type >() + ::o3tl::select2nd< NamedDefinitions::value_type >() ) ); } diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 208b2486c459..e24c2bf59113 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -38,6 +38,7 @@ #include #include +#include namespace dbaccess { @@ -223,7 +224,7 @@ namespace dbaccess m_pData->rEventsData.begin(), m_pData->rEventsData.end(), aNames.getArray(), - ::std::select1st< DocumentEventsData::value_type >() + ::o3tl::select1st< DocumentEventsData::value_type >() ); return aNames; } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index b8985dbbc6aa..f55db34adf86 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -1558,7 +1559,7 @@ Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroup ::std::transform( aCmdHashMap.begin(), aCmdHashMap.end(), aCommandGroups.getArray(), - ::std::select1st< CommandHashMap::value_type >() + ::o3tl::select1st< CommandHashMap::value_type >() ); return aCommandGroups; diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 8e607d5a2d9d..1667a8d65ae7 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -55,6 +55,7 @@ #include #include +#include //......................................................................... namespace dbaui @@ -287,9 +288,9 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn { String sRootEntryText; TNames::const_iterator aViews = ::std::find_if(_rTables.begin(),_rTables.end(), - ::std::compose1(::std::bind2nd(::std::equal_to(),sal_False),::std::select2nd())); + ::o3tl::compose1(::std::bind2nd(::std::equal_to(),sal_False),::o3tl::select2nd())); TNames::const_iterator aTables = ::std::find_if(_rTables.begin(),_rTables.end(), - ::std::compose1(::std::bind2nd(::std::equal_to(),sal_True),::std::select2nd())); + ::o3tl::compose1(::std::bind2nd(::std::equal_to(),sal_True),::o3tl::select2nd())); if ( aViews == _rTables.end() ) sRootEntryText = String(ModuleRes(STR_ALL_TABLES)); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index c7172599d729..41f0b2db8cb6 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -86,6 +86,8 @@ #include #include +#include + //......................................................................... namespace dbaui { @@ -839,7 +841,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::std::transform(m_aIndirectPropTranslator.begin(), m_aIndirectPropTranslator.end(), ::std::insert_iterator(aIndirectProps,aIndirectProps.begin()), - ::std::select2nd()); + ::o3tl::select2nd()); // 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 221b38e228ef..b2cf2a0fb2d6 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -56,6 +56,7 @@ #include "UITools.hxx" #include #include +#include #include #include #include @@ -869,7 +870,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R for(sal_uInt32 j=0; j < aInsertList.size() ;++i,++j) { ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(), - ::std::compose1(::std::bind2nd(::std::equal_to(),i+1),::std::select2nd())); + ::o3tl::compose1(::std::bind2nd(::std::equal_to(),i+1),::o3tl::select2nd())); if ( _rvColumns.end() != aFind && aFind->second != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) && aFind->first != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) ) { OSL_ENSURE((aFind->first) < static_cast(aInsertList.size()),"aInsertList: Illegal index for vector"); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 3d678a8035fc..b71e6f3130c6 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -43,6 +43,7 @@ #include #include "dbustrings.hrc" #include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -336,9 +337,9 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, { // find the new column in the dest name mapping to obtain the old column OCopyTableWizard::TNameMapping::iterator aIter = ::std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(_aCase, _sColumnName), - ::std::select2nd()) + ::o3tl::select2nd()) ); OSL_ENSURE(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); @@ -386,7 +387,7 @@ USHORT OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, { // find the new column in the dest name mapping to obtain the old column OCopyTableWizard::TNameMapping::iterator aIter = ::std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(_aCase, sColumnString), ::std::select2nd()) ); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 3bfe39cea3cc..63a98f5aee6c 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -75,6 +75,7 @@ #include #include +#include using namespace ::dbaui; using namespace ::com::sun::star::uno; @@ -930,7 +931,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) if ( supportsPrimaryKey() ) { ODatabaseExport::TColumns::iterator aFind = ::std::find_if(m_vDestColumns.begin(),m_vDestColumns.end() - ,::std::compose1(::std::mem_fun(&OFieldDescription::IsPrimaryKey),::std::select2nd())); + ,::o3tl::compose1(::std::mem_fun(&OFieldDescription::IsPrimaryKey),::o3tl::select2nd())); if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { @@ -1375,8 +1376,8 @@ Reference< XPropertySet > OCopyTableWizard::createTable() ODatabaseExport::TPositions::iterator aPosFind = ::std::find_if( m_vColumnPos.begin(), m_vColumnPos.end(), - ::std::compose1( ::std::bind2nd( ::std::equal_to< sal_Int32 >(), nPos ), - ::std::select1st< ODatabaseExport::TPositions::value_type >() + ::o3tl::compose1( ::std::bind2nd( ::std::equal_to< sal_Int32 >(), nPos ), + ::o3tl::select1st< ODatabaseExport::TPositions::value_type >() ) ); -- cgit