summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@pardus.org.tr>2018-09-20 17:16:28 +0300
committerMuhammet Kara <muhammet.kara@pardus.org.tr>2018-09-20 21:44:48 +0200
commit4cc71fef5a4fd05b2ee2953dd8a297ffffff29a0 (patch)
treefc2d56b6bc9383c2b3fd88d4d33a57a07b37d421 /vcl
parent66232248ff55639052ddb76918d555e21dc9c46b (diff)
Use slug instead of name to store Personas
Persona names aren't necessarily unique, but the slug is a unique id (also called pretty name) for personas. It can also be directly used to retrieve/reach the original url of an installed persona. Change-Id: Ieb81671a0fd654a727063d00a4f78a3b5cb29cbd Reviewed-on: https://gerrit.libreoffice.org/60821 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/settings.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 0dc2558ab36a..8da8c0355e7d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2122,7 +2122,10 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot
if ( aPersona == "own" || aPersona == "default" )
{
sal_Int32 nIndex = 0;
- aHeader = aPersonaSettings.getToken( 0, ';', nIndex );
+
+ // Skip the persona slug and name
+ aHeader = aPersonaSettings.getToken( 2, ';', nIndex );
+
if ( nIndex > 0 )
aFooter = aPersonaSettings.getToken( 0, ';', nIndex );