cui/source/dialogs/cuicharmap.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5a1d07a819bd0f14dd901b35ae245bcd681cb512
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Apr 24 15:21:48 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Apr 24 16:06:01 2023 +0200
tdf#154884: do not stop if the first pair is not what we looked for
The same character can be added later with a different font, so keep
searching
Change-Id: I7b83438ca476ffab23ca08268cf957045d75f6f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150937
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 81594684d5ed..c075c12326d2 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -276,8 +276,8 @@ findInPair(std::u16string_view str1, const
std::deque<OUString>& rContainer1,
{
assert(rContainer1.size() == rContainer2.size());
- if (auto it1 = std::find(rContainer1.begin(), rContainer1.end(), str1);
- it1 != rContainer1.end())
+ for (auto it1 = std::find(rContainer1.begin(), rContainer1.end(), str1);
+ it1 != rContainer1.end(); it1 = std::find(std::next(it1),
rContainer1.end(), str1))
{
auto it2 = rContainer2.begin() + (it1 - rContainer1.begin());
if (*it2 == str2)
