diff options
Diffstat (limited to 'dbaccess/source/ui/misc/WColumnSelect.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/WColumnSelect.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 9d143636b3a8..84a2a917ac27 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -31,7 +31,7 @@ #include "WColumnSelect.hxx" #include "dbu_misc.hrc" -#include <tools/debug.hxx> +#include <osl/diagnose.h> #include "WizardPages.hrc" #include "WCopyTable.hxx" #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> @@ -43,6 +43,7 @@ #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; @@ -336,12 +337,12 @@ 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<OCopyTableWizard::TNameMapping::value_type>()) + ::o3tl::select2nd<OCopyTableWizard::TNameMapping::value_type>()) ); - DBG_ASSERT(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); + OSL_ENSURE(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); if ( aIter == m_pParent->m_mNameMapping.end() ) return; // do nothing const ODatabaseExport::TColumns* pSrcColumns = m_pParent->getSourceColumns(); @@ -386,12 +387,12 @@ 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<OCopyTableWizard::TNameMapping::value_type>()) + ::o3tl::select2nd<OCopyTableWizard::TNameMapping::value_type>()) ); - DBG_ASSERT(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); + OSL_ENSURE(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); const ODatabaseExport::TColumns* pSrcColumns = m_pParent->getSourceColumns(); ODatabaseExport::TColumns::const_iterator aSrcIter = pSrcColumns->find((*aIter).first); if ( aSrcIter != pSrcColumns->end() ) |