vcl/source/window/NotebookBarAddonsMerger.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
New commits: commit 481b0844d82a92faaecc9db73f6973093dd21c04 Author: Rafał Dobrakowski <dobrakowskira...@gmail.com> AuthorDate: Wed Feb 19 23:17:47 2025 +0100 Commit: Hossein <hoss...@libreoffice.org> CommitDate: Thu Feb 20 11:49:29 2025 +0100 tdf#145538 Use range based for loops refactor: Simplify loops in MergeNotebookBarAddons and MergeNotebookBarMenuAddons functions Change-Id: Ie7c8daebca810d05a652dd995827248a1dee89de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181926 Reviewed-by: Hossein <hoss...@libreoffice.org> Tested-by: Jenkins diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index df744aeca84b..a2576887692c 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -112,12 +112,9 @@ void MergeNotebookBarAddons(vcl::Window* pParent, const VclBuilder::customMakeWi std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues; tools::ULong nIter = 0; sal_uInt16 nPriorityIdx = aImageVec.size(); - css::uno::Sequence<css::uno::Sequence<css::beans::PropertyValue>> aExtension; - for (std::size_t nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++) + for (const auto& aExtension : aNotebookBarAddonsItem.aAddonValues) { - aExtension = aNotebookBarAddonsItem.aAddonValues[nIdx]; - - for (const css::uno::Sequence<css::beans::PropertyValue>& pExtension : aExtension) + for (const auto& pExtension : aExtension) { VclPtr<vcl::Window> pOptionalParent; pOptionalParent = VclPtr<OptionalBox>::Create(pParent); @@ -146,11 +143,8 @@ void MergeNotebookBarMenuAddons(Menu* pPopupMenu, sal_Int16 nItemId, const OUStr { std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues; tools::ULong nIter = 0; - css::uno::Sequence<css::uno::Sequence<css::beans::PropertyValue>> aExtension; - for (std::size_t nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++) + for (const auto& aExtension : aNotebookBarAddonsItem.aAddonValues) { - aExtension = aNotebookBarAddonsItem.aAddonValues[nIdx]; - for (int nSecIdx = 0; nSecIdx < aExtension.getLength(); nSecIdx++) { AddonNotebookBarItem aAddonNotebookBarItem;