commit 1cbb39dc112117c4038ac63074c17154baa1d593
author Mike Kaganski <mike.kaganski@collabora.com> Wed Apr 28 11:25:18 2021 +0200
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Apr 29 11:07:18 2021 +0200
tree 6ce4737746e645ee2f6ddb93ee72dd4315b63603
parent 640d3ef7e2b1981499d7519765ec7679e1fd9846

tdf#135997: fix toolbar control

This is the same as fc7b4bfeba39a2479c9a2c9c8ef5ced5ab3c0de7,
just for the toolbar control (the older one was for special
character dialog).

The problem was present since 800ac37021e3f8859a52c5eebca261a5d3bc5a11.

Change-Id: Ib86aa7336a3078ff28b417de37fbd5bc492c85c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114719
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit b27de500b1412bacefc7144b5222c307ca1ae0fe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114731
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

sfx2/source/control/charmapcontrol.cxx

diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index 56af575..ce580f1 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -128,7 +128,7 @@ void SfxCharmapCtrl::updateFavCharControl()
{
    int i = 0;
    for ( std::deque< OUString >::iterator it = m_aFavCharList.begin(), it2 = m_aFavCharFontList.begin();
        it != m_aFavCharList.end() || it2 != m_aFavCharFontList.end();
        it != m_aFavCharList.end() && it2 != m_aFavCharFontList.end();
        ++it, ++it2, i++)
    {
        m_aFavCharView[i].SetText(*it);
@@ -160,7 +160,7 @@ void SfxCharmapCtrl::updateRecentCharControl()
{
    int i = 0;
    for ( std::deque< OUString >::iterator it = m_aRecentCharList.begin(), it2 = m_aRecentCharFontList.begin();
        it != m_aRecentCharList.end() || it2 != m_aRecentCharFontList.end();
        it != m_aRecentCharList.end() && it2 != m_aRecentCharFontList.end();
        ++it, ++it2, i++)
    {
        m_aRecentCharView[i].SetText(*it);