diff options
Diffstat (limited to 'dbaccess/source/ui/uno')
| -rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/makefile.mk | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/unoadmin.cxx | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 511edcd4bb07..9fa9d828d755 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1198,6 +1198,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou ++nRowCount; sal_Bool bInsertAutoIncrement = sal_True; ODatabaseExport::TPositions::const_iterator aPosIter = aColumnMapping.begin(); + ODatabaseExport::TPositions::const_iterator aPosEnd = aColumnMapping.end(); aCopyEvent.Error.clear(); try @@ -1209,7 +1210,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou sal_Int32 nSourceColumn( 1 ); ValueTransfer aTransfer( nSourceColumn, nDestColumn, aSourceColTypes, xRow, xStatementParams ); - for ( ; aPosIter != aColumnMapping.end(); ++aPosIter ) + for ( ; aPosIter != aPosEnd; ++aPosIter ) { nDestColumn = aPosIter->first; if ( nDestColumn == COLUMN_POSITION_NOT_FOUND ) diff --git a/dbaccess/source/ui/uno/makefile.mk b/dbaccess/source/ui/uno/makefile.mk index 8651a83fd33a..d29d881d7a26 100644 --- a/dbaccess/source/ui/uno/makefile.mk +++ b/dbaccess/source/ui/uno/makefile.mk @@ -62,7 +62,6 @@ SLOFILES= \ $(SLO)$/unoDirectSql.obj \ $(SLO)$/DBTypeWizDlg.obj \ $(SLO)$/DBTypeWizDlgSetup.obj \ - $(SLO)$/AdabasSettingsDlg.obj \ $(SLO)$/UserSettingsDlg.obj \ $(SLO)$/ColumnModel.obj \ $(SLO)$/ColumnControl.obj \ diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 547bad4cee07..d41675c0c051 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -94,8 +94,7 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XM { DBG_CTOR(ODatabaseAdministrationDialog,NULL); - m_pCollection = new ::dbaccess::ODsnTypeCollection(); - m_pCollection->initUserDriverTypes(m_aContext.getLegacyServiceFactory()); + m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB); ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection); } |