diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-24 15:21:48 +0300 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-04-25 10:12:39 +0200 |
commit | e80add00e316d46dceddbf7561926330380ff8dd (patch) | |
tree | 0966b700408ca41f91496fd117e49fc12aa4d19d /cui/source | |
parent | 98c95b65480c71d1fa0d3da1cdf68e13b73b6306 (diff) |
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.kaganski@collabora.com>
(cherry picked from commit 5a1d07a819bd0f14dd901b35ae245bcd681cb512)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150921
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index c6994000e36d..15b48725c93a 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) |