strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve the way %PRODUCTVERSION is expanded in 'tipoftheday'

Browse source 
Expand %PRODUCTVERSION in a much cleaner way.
Follow up to commit	0ed7f9dab2

Change-Id: If3d03cba19f89849c930d6dc3f1e07a65115e4e0
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-on: https://gerrit.libreoffice.org/77862
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Christophe JAILLET 2019-08-20 21:21:44 +02:00 committed by Heiko Tietze
parent e6109939b4
commit 0615f3bc12
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cui/source/dialogs/tipofthedaydlg.cxx
View file

@ -29,6 +29,7 @@
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <unotools/resmgr.hxx>
#include <unotools/configmgr.hxx>
TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
@ -88,8 +89,8 @@ void TipOfTheDayDialog::UpdateTip()
}
else if (aLink.startsWith("http"))
{
aText = CuiResId(aLink.toUtf8().getStr());
// Links may have some %PRODUCTVERSION which need to be expanded
aText = Translate::ExpandVariables(aLink);
sal_Int32 aPos = aText.indexOf("%LANGUAGENAME");
if (aPos != -1)
{
@ -98,8 +99,8 @@ void TipOfTheDayDialog::UpdateTip()
aLang = LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
aText = aText.replaceAt(aPos, 13, aLang);
}
m_pLink->set_uri(aText);
m_pLink->set_label(CuiResId(STR_MORE_LINK));
m_pLink->set_visible(true);
m_pLink->connect_clicked(Link<weld::LinkButton&, void>());