[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/tool/dbdata.cxx       |    7 +++----
 sc/source/ui/cctrl/checklistmenu.cxx |    6 +++---
 sc/source/ui/inc/checklistmenu.hxx   |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 2a5ba6ff05d94065c37324b32fa463c7373a4755
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 24 12:48:42 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Mar 25 09:58:22 2022 +0100

    loplugin:constantparam
    
    Change-Id: Ic2c93bca1b77c29e547473f889f53a2af8755fe4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132086
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 3042404e0eaa..b62d3b76b8bf 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1010,7 +1010,7 @@ public:
 };
 
 OUString lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs,
-                                         const OUString& sOldName, bool 
bIsUpperName)
+                                         const OUString& sOldName)
 {
     sal_Int32 nLastIndex = sOldName.lastIndexOf('_') + 1;
     sal_Int32 nOldNumber = 1;
@@ -1034,8 +1034,7 @@ OUString 
lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs,
     do
     {
         sNewName = sOldName.subView(0, nLastIndex) + 
OUString::number(++nOldNumber);
-    } while ((bIsUpperName ? namedDBs.findByUpperName(sNewName) : 
namedDBs.findByName(sNewName))
-             != nullptr);
+    } while (namedDBs.findByName(sNewName) != nullptr);
     return sNewName;
 }
 
@@ -1553,7 +1552,7 @@ void ScDBCollection::CopyToTable(SCTAB nOldPos, SCTAB 
nNewPos)
             return;
 
         OUString newName
-            = lcl_IncrementNumberInNamedRange(getNamedDBs(), 
rxNamedDB->GetName(), false);
+            = lcl_IncrementNumberInNamedRange(getNamedDBs(), 
rxNamedDB->GetName());
         std::unique_ptr<ScDBData> pDataCopy = 
std::make_unique<ScDBData>(newName, *rxNamedDB);
         pDataCopy->UpdateMoveTab(nOldPos, nNewPos);
         pDataCopy->SetIndex(0);
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index a3ecb34b5f7d..3e9420ecd05b 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -114,7 +114,7 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, SelectHdl, 
weld::TreeView&, void)
     else
         nSelectedMenu = mxMenu->get_iter_index_in_parent(*mxScratchIter);
 
-    setSelectedMenuItem(nSelectedMenu, true);
+    setSelectedMenuItem(nSelectedMenu);
 }
 
 void ScCheckListMenuControl::addMenuItem(const OUString& rText, Action* 
pAction)
@@ -216,13 +216,13 @@ void ScCheckListMenuControl::executeMenuItem(size_t nPos)
         terminateAllPopupMenus();
 }
 
-void ScCheckListMenuControl::setSelectedMenuItem(size_t nPos, bool 
bSubMenuTimer)
+void ScCheckListMenuControl::setSelectedMenuItem(size_t nPos)
 {
     if (mnSelectedMenu == nPos)
         // nothing to do.
         return;
 
-    selectMenuItem(nPos, bSubMenuTimer);
+    selectMenuItem(nPos, /*bSubMenuTimer*/true);
 }
 
 void ScCheckListMenuControl::handleMenuTimeout(const SubMenuItemData* pTimer)
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index 55525bac96f0..eaad396bee1a 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -204,7 +204,7 @@ private:
     int GetCheckedEntryCount() const;
     void CheckAllChildren(const weld::TreeIter& rEntry, bool bCheck);
 
-    void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer);
+    void setSelectedMenuItem(size_t nPos);
 
     std::unique_ptr<weld::TreeIter> FindEntry(const weld::TreeIter* pParent, 
std::u16string_view sNode);