summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorStephan Bergmann <stephan.bergmann@allotropia.de>2024-01-12 16:55:18 +0100
committerStephan Bergmann <stephan.bergmann@allotropia.de>2024-01-22 09:33:42 +0100
commit8fc46ffb0e7ecdd6975516ecc722d477fb0b29ad (patch)
tree206fd09662065243cfbd201a944883d9fa152569 /scp2
parent9919d02c1e9be7ab2f2690ca16da65b75ebde666 (diff)
Remove (Windows-only) UpgradeCode from setup.ini and version.ini
(See a31f334d36b5735ba6fc8d0f89e834a73bdcc561 "Windows MAR update issues with program/{setup,version}.ini" for why this cleanup is needed.) I couldn't find any traces of any code actually reading that entry from ini-files. (There is some code in setup_native/source/win32/customactions/shellextensions/ calling GetMsiPropertyW with an L"UpgradeCode" argument, but that's something different.) Change-Id: I8ed79e7f7911635c52e1c41f54014b1445c561de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161980 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/common_brand.scp24
1 files changed, 0 insertions, 24 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;