[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

[Mike Kaganski]

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    2 +-
 scp2/source/ooo/vc_redist.scp                                      |    2 +-
 solenv/bin/modules/installer/windows/upgrade.pm                    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a6045159237419ce8fa49202c672e3895f0ab30a
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Apr 16 16:41:21 2018 +0100

    Use different properties in Upgrade table
    
    Change-Id: I7e2cc08a1312da629e4644be97ebc7ed40250702
    Reviewed-on: https://gerrit.libreoffice.org/52995
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 2b633b8eb37a..fcdd9162d680 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3	installs
 Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
+SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
 SetupType	Typical
 SELECT_WORD	0
 SELECT_EXCEL	0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 921a9433e820..c4750ff5ad69 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
     Source = VCREDIST_EXE_NAME;
     Target = "/repair /norestart /passive";
     Inbinarytable = 1;
-    Assignment1 = ("InstallUISequence", "Not Installed And Not ( VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction");
+    Assignment1 = ("InstallUISequence", "Not Installed And Not ( (VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index cb54a794cbc5..b008d010fb15 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -52,7 +52,7 @@ sub create_upgrade_table
     # 32-bit installer must also detect if 32-bit Runtime is installed
     if ( $installer::globals::cpuname ne 'X86_64' )
     {
-        $newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
+        $newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED_32";
         push(@upgradetable, $newline);
     }