[Libreoffice-commits] core.git: scp2/source

Andras Timar andras.timar at collabora.com
Wed Sep 21 21:39:14 UTC 2016


 scp2/source/ooo/registryitem_ooo.scp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 131446b38311b3437daa187ac534a0d05a9df9ee
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Sep 20 18:38:59 2016 +0200

    tdf#93237 different Windows Uninstall DisplayName for 32-bit and 64-bit builds
    
    Change-Id: I6c7f9dd6e64a448b60904d8ee57fd45a45153f01
    Reviewed-on: https://gerrit.libreoffice.org/29102
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6a80966..033b3c1 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -180,7 +180,11 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     ModuleID = gid_Module_Root;
     Name = "DisplayName";
-    Value = "%PRODUCTNAME %PRODUCTVERSION";
+#if defined WINDOWS_X64
+    Value = "%PRODUCTNAME %PRODUCTVERSION 64-bit";
+#else
+    Value = "%PRODUCTNAME %PRODUCTVERSION 32-bit";
+#endif
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname2


More information about the Libreoffice-commits mailing list