From 31736f5f0abc09eb4066d09fd9e7394d844f9748 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 28 Apr 2021 11:25:18 +0200 Subject: 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 Reviewed-by: Mike Kaganski (cherry picked from commit b27de500b1412bacefc7144b5222c307ca1ae0fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114853 Reviewed-by: Michael Stahl Tested-by: Jenkins --- sfx2/source/control/charmapcontrol.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx index 69e1a197d4ee..50a716a25ad6 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); -- cgit