loplugin:loopvartoosmall (clang-cl)

Change-Id: I682fccecd94d1d1524fcb12e93f5d53b0c94ea03
Reviewed-on: https://gerrit.libreoffice.org/79935
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 13 insertions, 7 deletions

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index a8dcfb6e334b..4ab507ed4824 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -25,6 +25,8 @@
 #include <vcl/svapp.hxx>
 
 #include <algorithm>
+#include <cstddef>
+
 #include <helpids.h>
 #include <strings.hrc>
 
@@ -64,7 +66,7 @@ static bool isCategoryAvailable(const OUString& sClassId, const OUString& sUIIte
 static OUString charToString(const char* cString)
 {
     OUStringBuffer aString;
-    for (unsigned long i = 0; i < strlen(cString); i++)
+    for (std::size_t i = 0; i < strlen(cString); i++)
     {
         aString.append(cString[i]);
     }
@@ -458,7 +460,7 @@ void SvxNotebookbarConfigPage::SelectElement()
 
     if (m_xTopLevelListBox->get_count() == 1)
     {
-        for (unsigned long nIdx = 0; nIdx < aCategoryList.size(); nIdx++)
+        for (std::size_t nIdx = 0; nIdx < aCategoryList.size(); nIdx++)
             m_xTopLevelListBox->append(aCategoryList[nIdx].sUIItemId,
                                        aCategoryList[nIdx].sDisplayName);
     }
@@ -468,7 +470,7 @@ void SvxNotebookbarConfigPage::SelectElement()
         nStart = 1;
 
     std::vector<NotebookbarEntries> aTempEntries;
-    for (unsigned long nIdx = nStart; nIdx < aEntries.size(); nIdx++)
+    for (std::size_t nIdx = nStart; nIdx < aEntries.size(); nIdx++)
     {
         if (aEntries[nIdx].sClassId == "svtlo-ManagedMenuButton")
         {
@@ -477,7 +479,7 @@ void SvxNotebookbarConfigPage::SelectElement()
             sal_Int32 rPos = 1;
             sActiveCategory = aEntries[nIdx].sUIItemId.getToken(rPos, ':', rPos);
             FillFunctionsList(aGtkEntries, aCategoryList, sActiveCategory);
-            for (unsigned long Idx = 0; Idx < aGtkEntries.size(); Idx++)
+            for (std::size_t Idx = 0; Idx < aGtkEntries.size(); Idx++)
                 aTempEntries.push_back(aGtkEntries[Idx]);
             aGtkEntries.clear();
         }
@@ -489,7 +491,7 @@ void SvxNotebookbarConfigPage::SelectElement()
     aTempEntries.clear();
 
     sal_Int64 nId = 0;
-    for (unsigned long nIdx = 0; nIdx < aEntries.size(); nIdx++)
+    for (std::size_t nIdx = 0; nIdx < aEntries.size(); nIdx++)
     {
         OUString sId(OUString::number(nId));
         m_xContentsListBox->insert(nIdx, sId);
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index 01c8bbd0977e..1bd4547e5987 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cstddef>
+
 #include <vcl/NotebookBarAddonsMerger.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/vclenum.hxx>
@@ -118,7 +122,7 @@ void NotebookBarAddonsMerger::MergeNotebookBarAddons(
     unsigned long nIter = 0;
     sal_uInt16 nPriorityIdx = aImageVec.size();
     css::uno::Sequence<css::uno::Sequence<css::beans::PropertyValue>> aExtension;
-    for (unsigned long nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++)
+    for (std::size_t nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++)
     {
         aExtension = aNotebookBarAddonsItem.aAddonValues[nIdx];
 
@@ -154,7 +158,7 @@ void NotebookBarAddonsMerger::MergeNotebookBarMenuAddons(
     std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues;
     unsigned long nIter = 0;
     css::uno::Sequence<css::uno::Sequence<css::beans::PropertyValue>> aExtension;
-    for (unsigned long nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++)
+    for (std::size_t nIdx = 0; nIdx < aNotebookBarAddonsItem.aAddonValues.size(); nIdx++)
     {
         aExtension = aNotebookBarAddonsItem.aAddonValues[nIdx];