cui/source/options/treeopt.cxx | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit fdff5df464598261ed8d5137e1685bc538b3cb25
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Nov 22 12:26:08 2019 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Nov 23 10:05:02 2019 +0100
OfaTreeOptionsDialog::LoadModule: Use range-based for
Change-Id: I2b191dd55dcd9e085b2cde6bacd1e2e3c963fafa
Reviewed-on: https://gerrit.libreoffice.org/83489
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0195856932c7..69f59f745421 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1653,18 +1653,17 @@ std::unique_ptr<Module>
OfaTreeOptionsDialog::LoadModule(
Reference< XNameAccess > xSet(
officecfg::Office::OptionsDialog::Modules::get());
- Sequence< OUString > seqNames = xSet->getElementNames();
- for ( int i = 0; i < seqNames.getLength(); ++i )
+ const Sequence< OUString > seqNames = xSet->getElementNames();
+ for ( const OUString& rModule : seqNames )
{
- OUString sModule( seqNames[i] );
- if ( rModuleIdentifier == sModule )
+ if ( rModuleIdentifier == rModule )
{
// current active module found
pModule.reset(new Module);
pModule->m_bActive = true;
Reference< XNameAccess > xModAccess;
- xSet->getByName( seqNames[i] ) >>= xModAccess;
+ xSet->getByName( rModule ) >>= xModAccess;
if ( xModAccess.is() )
{
// load the nodes of this module
@@ -1672,19 +1671,19 @@ std::unique_ptr<Module>
OfaTreeOptionsDialog::LoadModule(
xModAccess->getByName( "Nodes" ) >>= xNodeAccess;
if ( xNodeAccess.is() )
{
- Sequence< OUString > xTemp =
xNodeAccess->getElementNames();
+ const Sequence< OUString > xTemp =
xNodeAccess->getElementNames();
Reference< XNameAccess > xAccess;
sal_Int32 nIndex = -1;
- for ( int x = 0; x < xTemp.getLength(); ++x )
+ for ( const OUString& rNode : xTemp)
{
- xNodeAccess->getByName( xTemp[x] ) >>= xAccess;
+ xNodeAccess->getByName( rNode ) >>= xAccess;
if ( xAccess.is() )
{
xAccess->getByName( "Index" ) >>= nIndex;
if ( nIndex < 0 )
// append nodes with index < 0
pModule->m_aNodeList.push_back(
- std::unique_ptr<OrderedEntry>(new
OrderedEntry(nIndex, xTemp[x])));
+ std::unique_ptr<OrderedEntry>(new
OrderedEntry(nIndex, rNode)));
else
{
// search position of the node
@@ -1698,7 +1697,7 @@ std::unique_ptr<Module> OfaTreeOptionsDialog::LoadModule(
// and insert the node on this position
pModule->m_aNodeList.insert(
pModule->m_aNodeList.begin() + y,
- std::unique_ptr<OrderedEntry>(new
OrderedEntry( nIndex, xTemp[x] )) );
+ std::unique_ptr<OrderedEntry>(new
OrderedEntry( nIndex, rNode )) );
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
