summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_openoffice
diff options
context:
space:
mode:
authorDirk Völzke <dv@openoffice.org>2009-12-04 13:06:13 +0000
committerDirk Völzke <dv@openoffice.org>2009-12-04 13:06:13 +0000
commit7c9c561807fe56d487305d884ef3e6fa77b70620 (patch)
treeddc08f43aa25dbca9bc8fc0eced01d2608fcf29b /instsetoo_native/inc_openoffice
parentf92fb56ceb8ba8c8125bbc970c068982e1b4dc19 (diff)
#i96594# Allow customization of 'register for Microsoft File Types' in custom setup
Diffstat (limited to 'instsetoo_native/inc_openoffice')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt12
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt2
2 files changed, 7 insertions, 7 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 7cfb9133c349..f335fb6828e1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -12,12 +12,12 @@ CustomerInformation SerialNumber Show SERIALNUMSHOW
CustomSetup ChangeFolder Hide Installed
CustomSetup Details Hide Installed
CustomSetup InstallLabel Hide Installed
-FileTypeDialog CheckBox1 Enable &gm_p_Wrt=3
-FileTypeDialog CheckBox1 Disable &gm_p_Wrt<>3
-FileTypeDialog CheckBox2 Enable &gm_p_Calc=3
-FileTypeDialog CheckBox2 Disable &gm_p_Calc<>3
-FileTypeDialog CheckBox3 Enable &gm_p_Impress=3
-FileTypeDialog CheckBox3 Disable &gm_p_Impress<>3
+FileTypeDialog CheckBox1 Enable &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 )
+FileTypeDialog CheckBox1 Disable NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) )
+FileTypeDialog CheckBox2 Enable &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 )
+FileTypeDialog CheckBox2 Disable NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) )
+FileTypeDialog CheckBox3 Enable &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 )
+FileTypeDialog CheckBox3 Disable NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
InstallWelcome Copyright Hide SHOWCOPYRIGHT="No"
InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes"
LicenseAgreement Next Disable AgreeToLicense <> "Yes"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index ed4dfcd8564d..3fe0c2062177 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,4 +2,4 @@ Condition Description
s255 l255
WINDOWSENCODINGTEMPLATE LaunchCondition Condition
Privileged OOO_LAUNCH_1
-(VersionNT < 600) or (SETUP_USED=1) OOO_LAUNCH_2 \ No newline at end of file
+(VersionNT < 600) or (SETUP_USED=1) or Installed OOO_LAUNCH_2 \ No newline at end of file