diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-08-31 11:38:35 +0200 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-09-02 07:37:25 +0200 |
commit | e21768ce2898453226aedd5f8ce19d8075f5bec5 (patch) | |
tree | 66c99698cc60752ddfa9bbb77af6eb033bfea39b /cui | |
parent | 39585d37e31de0754d6d66c9c5338ae9429b83c7 (diff) |
Resolves tdf#135790 - Support for multiple %MOD1/2 entries
While loop added
Change-Id: I81386bb23381e5248f3c045ad2b998a92346ec34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101700
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
(cherry picked from commit db5f204b1d3d96975d902b587d6d18bc06610eea)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101860
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/tipofthedaydlg.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx index 7d6a05b72a0f..4775ed0578b9 100644 --- a/cui/source/dialogs/tipofthedaydlg.cxx +++ b/cui/source/dialogs/tipofthedaydlg.cxx @@ -89,11 +89,17 @@ void TipOfTheDayDialog::UpdateTip() #endif sal_Int32 aPos; aPos = aText.indexOf("%MOD1"); - if (aPos != -1) + while (aPos != -1) + { aText = aText.replaceAt(aPos, 5, aMOD1); + aPos = aText.indexOf("%MOD1"); + } aPos = aText.indexOf("%MOD2"); - if (aPos != -1) + while (aPos != -1) + { aText = aText.replaceAt(aPos, 5, aMOD2); + aPos = aText.indexOf("%MOD2"); + } m_pText->set_label(aText); // hyperlink |