diff options
| author | Rachit Gupta <rachitgupta1792@gmail.com> | 2014-07-01 15:30:44 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-08-14 19:43:30 +0200 |
| commit | 5bed7be540e55149667fb5f4af826acdc1127efc (patch) | |
| tree | 72aff8e92c339639a787ef3b07427531f38b85f3 /vcl | |
| parent | 7b57ab7a98912a86d6131a79c81a1a1d857ed1c1 (diff) | |
Moved the personas installed through extensions handling to 'own'.
Change-Id: I12baaf22bfad73e228d3ed55dcf365f8eba9cf0a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index ebaa4eb1ebbe..730c80ff1ce9 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2152,13 +2152,13 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot { OUString gallery(""); // try the gallery first, then the program path: - if ( aPersona == "own") + if ( aPersona == "own" && !aPersonaSettings.startsWith( "vnd.sun.star.expand" ) ) { gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( gallery ); gallery += "/user/gallery/personas/"; } - else if ( aPersona == "default" && !aPersonaSettings.startsWith( "vnd.sun.star.expand" ) ) + else if ( aPersona == "default" ) { gallery = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER; gallery += "/gallery/personas/"; |