diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-18 11:34:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-19 09:05:58 +0200 |
| commit | cdbe8a8700d5460e41d80b00310c6ff8977bc492 (patch) | |
| tree | fb8f92ea13ccffad72894770ff75c8e8abc2a6c7 /cui | |
| parent | 618baf4c5b40f19be6e47e1384fbc7a6b7610416 (diff) | |
loplugin:constantparam
and tweak the plugin to handle a crash seen with clang-9
Change-Id: Ie1ccf80c16a20dbca58e5bd081af13f75cf5ac8f
Reviewed-on: https://gerrit.libreoffice.org/75850
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxMenuConfigPage.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/SvxToolbarConfigPage.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 2f210e91619c..496e245d29bd 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -424,7 +424,7 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, SelectCategory, weld::ComboBox&, void) IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandHdl, weld::Button&, void ) { - int nPos = AddFunction(); + int nPos = AddFunction(-1, /*bAllowDuplicates*/false); if (nPos == -1) return; SvxConfigEntry* pEntry = diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index b49e349ba245..2fc8aae463af 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -865,7 +865,7 @@ void SvxToolbarConfigPage::AddFunction(int nTarget) // Add the command to the contents listbox of the selected toolbar int nNewLBEntry = - SvxConfigPage::AddFunction(nTarget, /*bFront*/false, true/*bAllowDuplicates*/); + SvxConfigPage::AddFunction(nTarget, true/*bAllowDuplicates*/); if (nNewLBEntry == -1) return; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d9f3b6dca4c0..b6d9bb2a5c61 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1422,7 +1422,7 @@ SvxEntries* SvxConfigPage::FindParentForChild( return nullptr; } -int SvxConfigPage::AddFunction(int nTarget, bool bFront, bool bAllowDuplicates) +int SvxConfigPage::AddFunction(int nTarget, bool bAllowDuplicates) { OUString aURL = GetScriptURL(); SvxConfigEntry* pParent = GetTopLevelSelection(); @@ -1465,7 +1465,7 @@ int SvxConfigPage::AddFunction(int nTarget, bool bFront, bool bAllowDuplicates) } } - return InsertEntry(pNewEntryData, nTarget, bFront); + return InsertEntry(pNewEntryData, nTarget, /*bFront*/false); } int SvxConfigPage::InsertEntry( diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index b2c2aa0ee4d3..140864de6126 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -459,9 +459,8 @@ public: SaveInData* GetSaveInData() { return pCurrentSaveInData; } - int AddFunction(int nTarget = -1, - bool bFront = false, - bool bAllowDuplicates = false); + int AddFunction(int nTarget, + bool bAllowDuplicates); virtual void MoveEntry( bool bMoveUp ); |