diff options
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/RelationControl.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/curledit.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 3 |
4 files changed, 10 insertions, 12 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index a9c757a3cf70..4d9e81bc1f83 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -963,7 +963,8 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) { const OTypeInfoMap* pTypeInfo = getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); - for(;aIter != pTypeInfo->end();++aIter) + OTypeInfoMap::const_iterator aEnd = pTypeInfo->end(); + for(;aIter != aEnd;++aIter) m_pType->InsertEntry( aIter->second->aUIName ); } m_pType->SelectEntryPos(0); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 08416eb7496e..49d493ad8806 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -538,7 +538,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent // die Namen aller TabWins einsammeln OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->begin(); - for(;aIter != m_pTableMap->end();++aIter) + OJoinTableView::OTableWindowMap::const_iterator aEnd = m_pTableMap->end(); + for(;aIter != aEnd;++aIter) { m_lmbLeftTable.InsertEntry(aIter->first); m_lmbRightTable.InsertEntry(aIter->first); diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 8dc6cd76abb8..02bddf81ac67 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -48,6 +48,7 @@ namespace dbaui //========================================================================= OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,BOOL _bShowPrefix) :Edit(_pParent, _rResId) + ,m_pTypeCollection(NULL) ,m_pForcedPrefix(NULL) ,m_bShowPrefix(_bShowPrefix) { @@ -111,13 +112,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe if (!bIsEmpty) { // determine the type of the new URL described by the new text - ::dbaccess::DATASOURCE_TYPE eType = m_aTypeCollection.getType(_rStr); - // and the prefix belonging to this type - if ( ::dbaccess::DST_UNKNOWN != eType) - sPrefix = m_aTypeCollection.getDatasourcePrefix(eType); - else { - DBG_ERROR("OConnectionURLEdit::SetText : the new text is no valid connection URL!"); - } + sPrefix = m_pTypeCollection->getPrefix(_rStr); } // the fixed text gets the prefix @@ -139,10 +134,10 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe GetSubEdit()->Show(); // do the real SetTex -// Edit::SetText(bIsEmpty ? _rStr : m_aTypeCollection.cutPrefix(_rStr), _rNewSelection); +// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); String sNewText( _rStr ); if ( !bIsEmpty ) - sNewText =m_aTypeCollection.cutPrefix( _rStr ); + sNewText = m_pTypeCollection->cutPrefix( _rStr ); Edit::SetText( sNewText ); } diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index a3608f49828a..86f5d02f5054 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -175,7 +175,8 @@ namespace dbaui } TCommandState::iterator aIter = m_aStates.begin(); - for (; aIter != m_aStates.end(); ++aIter) + TCommandState::iterator aEnd = m_aStates.end(); + for (; aIter != aEnd; ++aIter) addStatusListener(aIter->first); ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); |