summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/querydesign/JoinController.cxx
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-03-10 14:49:40 +0100
committerJulien Nabet <serval2412@yahoo.fr>2018-03-10 16:52:53 +0100
commitba98f6e3e4dbfc23474e13d59bb08c618ee8c4e5 (patch)
tree31e69726116d87a088d561cadae96bf2e08d07a4 /dbaccess/source/ui/querydesign/JoinController.cxx
parent351043e5120470ff4d382f01e4c2f215ba84ef59 (diff)
Modernize a bit more dbaccess (part2)
mainly by using for-range loops but also by simplifying some simple algo Change-Id: If5ce6d901761db2b872a99e6de0eb6d2f098df99 Reviewed-on: https://gerrit.libreoffice.org/51044 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'dbaccess/source/ui/querydesign/JoinController.cxx')
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx31
1 files changed, 14 insertions, 17 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 06eace51be38..9575155533c1 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -292,10 +292,8 @@ void OJoinController::SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabW
OSL_ENSURE(m_vTableData.size() == pTabWinList->size(),
"OJoinController::SaveTabWinsPosSize : inconsistent state : should have as many TabWinDatas as TabWins !");
- OJoinTableView::OTableWindowMap::const_iterator aIter = pTabWinList->begin();
- OJoinTableView::OTableWindowMap::const_iterator aEnd = pTabWinList->end();
- for(;aIter != aEnd;++aIter)
- SaveTabWinPosSize(aIter->second, nOffsetX, nOffsetY);
+ for (auto const& tabWin : *pTabWinList)
+ SaveTabWinPosSize(tabWin.second, nOffsetX, nOffsetY);
}
void OJoinController::removeConnectionData(const TTableConnectionData::value_type& _pData)
@@ -390,21 +388,20 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
{
::comphelper::NamedValueCollection aAllTablesData;
- TTableWindowData::const_iterator aIter = m_vTableData.begin();
- TTableWindowData::const_iterator aEnd = m_vTableData.end();
- for ( sal_Int32 i = 1; aIter != aEnd; ++aIter, ++i )
+ sal_Int32 i = 1;
+ for (auto const& elem : m_vTableData)
{
::comphelper::NamedValueCollection aWindowData;
- aWindowData.put( "ComposedName", (*aIter)->GetComposedName() );
- aWindowData.put( "TableName", (*aIter)->GetTableName() );
- aWindowData.put( "WindowName", (*aIter)->GetWinName() );
- aWindowData.put( "WindowTop", static_cast<sal_Int32>((*aIter)->GetPosition().Y()) );
- aWindowData.put( "WindowLeft", static_cast<sal_Int32>((*aIter)->GetPosition().X()) );
- aWindowData.put( "WindowWidth", static_cast<sal_Int32>((*aIter)->GetSize().Width()) );
- aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) );
- aWindowData.put( "ShowAll", (*aIter)->IsShowAll() );
-
- const OUString sTableName( "Table" + OUString::number( i ) );
+ aWindowData.put( "ComposedName", elem->GetComposedName() );
+ aWindowData.put( "TableName", elem->GetTableName() );
+ aWindowData.put( "WindowName", elem->GetWinName() );
+ aWindowData.put( "WindowTop", static_cast<sal_Int32>(elem->GetPosition().Y()) );
+ aWindowData.put( "WindowLeft", static_cast<sal_Int32>(elem->GetPosition().X()) );
+ aWindowData.put( "WindowWidth", static_cast<sal_Int32>(elem->GetSize().Width()) );
+ aWindowData.put( "WindowHeight", static_cast<sal_Int32>(elem->GetSize().Height()) );
+ aWindowData.put( "ShowAll", elem->IsShowAll() );
+
+ const OUString sTableName( "Table" + OUString::number( i++ ) );
aAllTablesData.put( sTableName, aWindowData.getPropertyValues() );
}