cui/source/options/personalization.cxx | 10 ++++++----
vcl/source/app/settings.cxx | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 39d8e5e574c7f445c4d34a7a72d6ac40e3364ddb
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
AuthorDate: Fri Oct 26 13:00:45 2018 +0300
Commit: Muhammet Kara <muhammet.k...@pardus.org.tr>
CommitDate: Fri Oct 26 13:47:28 2018 +0200
Towards solving tdf#120747: Remember the preview file of persona
Change-Id: I9230421a98ea5d1ec61bf1500b24949635db68d3
Reviewed-on: https://gerrit.libreoffice.org/62387
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@pardus.org.tr>
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index d1e3b7fcef56..f199ab2082cb 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -593,8 +593,6 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
if (aPreviewFile.isEmpty())
break;
- // There is no room for the preview file in the PersonaSettings
currently
- aPersonaSetting = aPersonaSetting.replaceFirst( aPreviewFile + ";", ""
);
m_vDefaultPersonaSettings.push_back( aPersonaSetting );
INetURLObject aURLObj( gallery + aPreviewFile );
@@ -897,6 +895,7 @@ void SearchAndParseThread::execute()
OUString aPersonaSetting = personaInfo.sSlug
+ ";" + personaInfo.sName
+ + ";" + personaInfo.sPreviewURL
+ ";" + personaInfo.sHeaderURL
+ ";" + personaInfo.sFooterURL
+ ";" + personaInfo.sTextColor;
@@ -959,6 +958,7 @@ void SearchAndParseThread::execute()
OUString aPersonaSetting = aPersonaInfo.sSlug
+ ";" + aPersonaInfo.sName
+ + ";" + aPersonaInfo.sPreviewURL
+ ";" + aPersonaInfo.sHeaderURL
+ ";" + aPersonaInfo.sFooterURL
+ ";" + aPersonaInfo.sTextColor;
@@ -1008,7 +1008,7 @@ void GetPersonaThread::execute()
if ( !xFileAccess.is() )
return;
- OUString aSlug, aName, aHeaderURL, aFooterURL, aTextColor;
+ OUString aSlug, aName, aPreviewURL, aHeaderURL, aFooterURL, aTextColor;
OUString aPersonaSetting;
// get the required fields from m_aSelectedPersona
@@ -1016,6 +1016,7 @@ void GetPersonaThread::execute()
aSlug = m_aSelectedPersona.getToken(0, ';', nIndex);
aName = m_aSelectedPersona.getToken(0, ';', nIndex);
+ aPreviewURL = m_aSelectedPersona.getToken(0, ';', nIndex);
aHeaderURL = m_aSelectedPersona.getToken(0, ';', nIndex);
aFooterURL = m_aSelectedPersona.getToken(0, ';', nIndex);
aTextColor = m_aSelectedPersona.getToken(0, ';', nIndex);
@@ -1025,6 +1026,7 @@ void GetPersonaThread::execute()
rtl::Bootstrap::expandMacros( gallery );
gallery += "/user/gallery/personas/";
+ OUString aPreviewFile( aSlug + "/" + INetURLObject( aPreviewURL
).getName() );
OUString aHeaderFile( aSlug + "/" + INetURLObject( aHeaderURL ).getName()
);
OUString aFooterFile( aSlug + "/" + INetURLObject( aFooterURL ).getName()
);
@@ -1055,7 +1057,7 @@ void GetPersonaThread::execute()
SolarMutexGuard aGuard;
- aPersonaSetting = aSlug + ";" + aName + ";" + aHeaderFile + ";" +
aFooterFile
+ aPersonaSetting = aSlug + ";" + aName + ";" + aPreviewFile + ";" +
aHeaderFile + ";" + aFooterFile
+ ";" + aTextColor;
m_pPersonaDialog->SetAppliedPersonaSetting( aPersonaSetting );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 454c88e23a16..267a58262229 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2123,8 +2123,8 @@ static void setupPersonaHeaderFooter( WhichPersona
eWhich, OUString& rHeaderFoot
{
sal_Int32 nIndex = 0;
- // Skip the persona slug and name
- aHeader = aPersonaSettings.getToken( 2, ';', nIndex );
+ // Skip the persona slug, name, and preview
+ aHeader = aPersonaSettings.getToken( 3, ';', nIndex );
if ( nIndex > 0 )
aFooter = aPersonaSettings.getToken( 0, ';', nIndex );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
