summaryrefslogtreecommitdiff
path: root/scp2/source/ooo/common_brand.scp
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2008-07-28 10:43:11 +0000
committerMathias Bauer <mba@openoffice.org>2008-07-28 10:43:11 +0000
commitefaa520b160452c43542c88d60b3419908c41322 (patch)
tree7cdfede5b45dd44425962dd28f72feb6944932d5 /scp2/source/ooo/common_brand.scp
parentcee47d2751e71e1edd6ae5a3b94ddb12e402d8a0 (diff)
#i92212#: new profile names
Diffstat (limited to 'scp2/source/ooo/common_brand.scp')
-rw-r--r--scp2/source/ooo/common_brand.scp14
1 files changed, 5 insertions, 9 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a1ec38adc3d6..557bbcaa758a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1,13 +1,13 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: common_brand.scp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
* This file is part of OpenOffice.org.
*
@@ -775,15 +775,11 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
Order = 3;
Key = "UserInstallation";
#ifdef WNT
- Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
+ Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
#elif defined MACOSX
- #if defined QUARTZ
- Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME-aqua/%USERDIRPRODUCTVERSION";
- #else
Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
- #endif
#else
- Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
+ Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
#endif
StandaloneValue = "$ORIGIN/..";
End
@@ -825,7 +821,7 @@ ProfileItem gid_Brand_ProfileItem_Soffice_Macosxrc2
Key = "MacOSXIntegrationDefaultFile";
Value = "${$ORIGIN/bootstraprc:BaseInstallation}/presets/macosxrc.txt";
End
-#endif
+#endif
#ifdef WNT
ProfileItem gid_Brand_Profileitem_Soffice_Hideeula