diff options
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 24 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 303bf24470dd..d5eecd354e0a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -498,19 +498,6 @@ ProfileItem gid_Brand_Profileitem_Version_Buildid Value = "<buildid>"; End -#ifdef WNT - -ProfileItem gid_Brand_Profileitem_Version_Upgradecode - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 9; - Key = "UpgradeCode"; - Value = "<upgradecode>"; -End - -#endif - ProfileItem gid_Brand_Profileitem_Version_Alllanguages ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; @@ -818,17 +805,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Findproduct End #endif -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Upgradecode - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 7; - Key = "UpgradeCode"; - Value = "<upgradecode>"; -End -#endif - ProfileItem gid_Brand_Profileitem_Setup_Buildid ProfileID = gid_Brand_Profile_Setup_Ini; ModuleID = gid_Module_Root_Brand; diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 040bc068889f..a7cb1ab317fe 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -625,7 +625,7 @@ sub changing_name_of_language_dependent_keys ################################################################################ # Replacement of setup variables in ConfigurationItems and ProfileItems -# <productkey>, <buildid>, <sequence_languages>, <upgradecode>, <productupdate> +# <productkey>, <buildid>, <sequence_languages>, <productupdate> ################################################################################ sub replace_setup_variables @@ -665,7 +665,6 @@ sub replace_setup_variables $value =~ s/\<buildid\>/$buildidstring/; $value =~ s/\<sequence_languages\>/$languagesstring/; $value =~ s/\<productkey\>/$productkey/; - $value =~ s/\<upgradecode\>/$installer::globals::upgradecode/; $value =~ s/\<alllanguages\>/$languagesstring/; $value =~ s/\<sourceid\>/$installer::globals::build/; $value =~ s/\<updateid\>/$updateid/; |