diff options
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 1 |
4 files changed, 6 insertions, 8 deletions
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 10dde93ce558..ac69822cac49 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -315,7 +315,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn { SvTreeListEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); if ( !pFolder ) - pFolder = InsertEntry( *folder, pRootEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); + InsertEntry( *folder, pRootEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); } } } diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 520d962d1d6f..aa7e3fdd1b47 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -336,7 +336,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() DataSourceInfoConverter::convert(getORB(), m_pCollection,sOld,m_sURL,m_pImpl->getCurrentDataSource()); ::dbaccess::DATASOURCE_TYPE eType = VerifyDataSourceType(m_pCollection->determineType(m_sURL)); if (eType == ::dbaccess::DST_UNKNOWN) - eType = m_pCollection->determineType(m_sOldURL); + m_pCollection->determineType(m_sOldURL); activatePath( static_cast<PathId>(m_pCollection->getIndexOf(m_sURL) + 1), true); updateTypeDependentStates(); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 4db1645904ea..0278118472c9 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -830,19 +830,18 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R const OUString* pIter = aDestColumnNames.getConstArray(); ::std::vector< OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); - sal_Int32 i = 0; - for(size_t j=0; j < aInsertList.size() ;++i,++j) + for(size_t j=0; j < aInsertList.size(); ++j) { ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(), - [i] (const ODatabaseExport::TPositions::value_type& tPos) { return tPos.second == i+1; }); + [j] (const ODatabaseExport::TPositions::value_type& tPos) + { return tPos.second == (sal_Int32)(j+1); }); 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<sal_Int32>(aInsertList.size()),"aInsertList: Illegal index for vector"); - aInsertList[aFind->first] = ::dbtools::quoteName( aQuote,*(pIter+i)); + aInsertList[aFind->first] = ::dbtools::quoteName( aQuote,*(pIter+j)); } } - i = 1; // create the sql string ::std::vector< OUString>::const_iterator aInsertEnd = aInsertList.end(); for (::std::vector< OUString>::const_iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 3db08021bf1e..286ab7ee9aab 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -782,7 +782,6 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& ::connectivity::OSQLParseNode::absorptions(pNodeTmp); pNodeTmp = pTemp->getChild(1); OSQLParseNode::compress(pNodeTmp); - pNodeTmp = pTemp->getChild(1); } OUString sTemp; pNode->parseNodeToStr(sTemp,getConnection()); |