vcl/source/app/settings.cxx | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 65afcc5a9e440ef4b1ac15800b2c32c4219a2908
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Sat Aug 24 21:26:51 2013 -0300
[PERSONA] Place default persona in explicit folder
Search for defaults personas "footer.jpg" and "header.jpg" in a dedicated
installation folder, under share/gallery/persona.
Change-Id: Ie79513136c4330771b0dfaaf2d04bcd07f2d8b05
Reviewed-on: https://gerrit.libreoffice.org/5606
Reviewed-by: Jan Holesovsky <ke...@suse.cz>
Tested-by: Jan Holesovsky <ke...@suse.cz>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4cbc502..92d2816 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -791,13 +791,20 @@ static void setupPersonaHeaderFooter( WhichPersona
eWhich, OUString& rHeaderFoot
if ( !aName.isEmpty() )
{
+ OUString gallery("");
// try the gallery first, then the program path:
- OUString gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
- rtl::Bootstrap::expandMacros( gallery );
- gallery += "/user/gallery/personas/";
-
- if ( aPersona == "own" )
- rHeaderFooterBitmap = readBitmapEx( gallery + aName );
+ if ( aPersona == "own")
+ {
+ gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE(
"bootstrap") "::UserInstallation}";
+ rtl::Bootstrap::expandMacros( gallery );
+ gallery += "/user/gallery/personas/";
+ }
+ else if (aPersona == "default")
+ {
+ gallery = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER;
+ gallery += "/gallery/personas/";
+ }
+ rHeaderFooterBitmap = readBitmapEx( gallery + aName );
if ( rHeaderFooterBitmap.IsEmpty() )
rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/"
LIBO_ETC_FOLDER "/" + aName );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
