INTEGRATION: CWS odfversion241_DEV300 (1.54.28.2.12); FILE MERGED

2008/05/21 14:44:51 pb 1.54.28.2.12.2: fix: #i89096# value gid_Profileitem_Version_Odfnotifyurl now a variable
2008/05/21 07:56:10 pb 1.54.28.2.12.1: fix: #i89096# new: gid_Profileitem_Version_Odfnotifyurl

1 files changed, 161 insertions, 2 deletions

diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index bf35e17329cf..ffe4fb707746 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.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: profileitem_ooo.scp,v $
- * $Revision: 1.63 $
+ * $Revision: 1.64 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -286,6 +286,165 @@ End
 
 //end configmgr
 
+ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "UNO_JAVA_COMPPATH";
+    Value = "$ORIGIN/classes";
+End
+
+ProfileItem gid_Profileitem_Setup_Uno_Services
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 2;
+    Key = "UNO_SERVICES";
+    Value = "$ORIGIN/setup_services.rdb";
+End
+
+ProfileItem gid_Profileitem_Setup_Uno_Types
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 3;
+    Key = "UNO_TYPES";
+    Value = "$ORIGIN/types.rdb";
+End
+
+#ifdef WNT
+
+ProfileItem gid_Profileitem_Setup_Alluserset
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "ALLUSERS";
+    Value = "[ALLUSERS]";
+    Inifiletablekey = "AllUsersSet";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+
+#endif
+
+#ifdef WNT
+
+ProfileItem gid_Profileitem_Setup_Findproduct
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "FINDPRODUCT";
+    Value = "[FINDPRODUCT]";
+    Inifiletablekey = "FindProductSet";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+
+#endif
+
+#ifdef WNT
+
+ProfileItem gid_Profileitem_Setup_Productcode
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "ProductCode";
+    Value = "<productcode>";
+End
+
+#endif
+
+#ifdef WNT
+
+ProfileItem gid_Profileitem_Setup_Upgradecode
+    ProfileID = gid_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "UpgradeCode";
+    Value = "<upgradecode>";
+End
+
+#endif
+
+ProfileItem gid_Profileitem_Soffice_Logo
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "Logo";
+    Value = "1";
+End
+
+#ifdef MACOSX
+
+ProfileItem gid_ProfileItem_Soffice_Macosxrc
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "MacOSXIntegrationUserFile";
+    Value = "${$ORIGIN/bootstraprc:UserInstallation}/user/macosxrc.txt";
+End
+
+ProfileItem gid_ProfileItem_Soffice_Macosxrc2
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "MacOSXIntegrationDefaultFile";
+    Value = "${$ORIGIN/bootstraprc:BaseInstallation}/presets/macosxrc.txt";
+End
+
+#endif
+
+ProfileItem gid_Profileitem_Soffice_ProgressBarColor
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 2;
+    Key = "ProgressBarColor";
+    Value = "0,0,128";
+End
+
+ProfileItem gid_Profileitem_Soffice_ProgressSize
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 3;
+    Key = "ProgressSize";
+    Value = "-1,6";
+End
+
+ProfileItem gid_Profileitem_Soffice_ProgressPosition
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "ProgressPosition";
+    Value = "-1,-1";
+End
+
+#ifdef WNT
+
+ProfileItem gid_Profileitem_Soffice_Hideeula
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "HideEula";
+    Value = "[HIDEEULA]";
+    Inifiletablekey = "HideEula";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+
+#endif
+
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;