instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt | 4 --
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 9
-----
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt | 13
+------
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt | 2 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt | 4 --
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 9
-----
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt | 13
+------
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt | 2 -
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 18
----------
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 9
-----
instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt | 13
+------
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 2 -
instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt | 4 --
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 9
-----
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt | 13
+------
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt | 2 -
instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt | 4 --
instsetoo_native/inc_ure/windows/msi_templates/Control.idt | 9
-----
instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt | 13
+------
instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt | 2 -
21 files changed, 10 insertions(+), 145 deletions(-)
New commits:
commit 1c2529ee738148f95f0f80df25950979ea89910f
Author: Andras Timar <ati...@suse.com>
Date: Mon May 7 10:14:56 2012 +0200
remove unused checkboxes from Windows installer
Change-Id: I51eea9c45b893f56dece99e8d01e385c96051f8d
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06..0000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property Value
-s72 S64
-CheckBox Property
-ISCHECKFORPRODUCTUPDATES 1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 40fbe5e..b686c60 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -254,21 +254,12 @@ SetupCompleteError TextLine1 Text 135
8 225 45 65539 OOO_CONTROL_190
SetupCompleteError TextLine2 Text 135 55 228 25
65539 OOO_CONTROL_191
SetupCompleteSuccess Back PushButton 164 243 66 17
1 OOO_CONTROL_192 OK
SetupCompleteSuccess Cancel PushButton 301 243 66 17
1 OOO_CONTROL_193 Image
-SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10
9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back
-SetupCompleteSuccess CheckForUpdatesText Text 152 162 190
30 65538 OOO_CONTROL_194
-SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114
10 9 2 LAUNCHPROGRAM
-SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148
10 9 2 LAUNCHREADME
SetupCompleteSuccess DlgLine Line 0 234 374 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1
ImageBmp CheckBoxUpdates
-SetupCompleteSuccess LaunchProgramText Text 164 112 198
15 65538 OOO_CONTROL_195
-SetupCompleteSuccess LaunchReadmeText Text 164 148 198
13 65538 OOO_CONTROL_196
SetupCompleteSuccess OK PushButton 230 243 66 17
3 OOO_CONTROL_197 Cancel
SetupCompleteSuccess TextLine1 Text 135 8 225 45
65539 OOO_CONTROL_198
SetupCompleteSuccess TextLine2 Text 135 55 228 45
65538 OOO_CONTROL_199
SetupCompleteSuccess TextLine3 Text 135 55 228 45
65538 OOO_CONTROL_200
-SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45
65538 OOO_CONTROL_201
-SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45
65538 OOO_CONTROL_202
-SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45
65538 OOO_CONTROL_203
SetupError A PushButton 192 80 66 17 3
OOO_CONTROL_204
SetupError C PushButton 192 80 66 17 3
OOO_CONTROL_205
SetupError ErrorText Text 50 15 200 50 3
OOO_CONTROL_206
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index 9adacf8..99e5224 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -29,17 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckForUpdatesText Show
ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index 285a77b..63ea995 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -99,8 +99,6 @@ SetupCompleteError Back EndDialog Return 1
2
SetupCompleteError Cancel [Suspend] 1 1 1
SetupCompleteError Cancel EndDialog Return 1 2
SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK DoAction CheckForProductUpdates
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT
ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4
-SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED
And NOT Installed And ACTION="INSTALL" 5
SetupCompleteSuccess OK EndDialog Exit 1 2
SetupError A EndDialog ErrorAbort 1 0
SetupError C EndDialog ErrorCancel 1 0
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property Value
-s72 S64
-CheckBox Property
-ISCHECKFORPRODUCTUPDATES 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 40fbe5e..b686c60 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -254,21 +254,12 @@ SetupCompleteError TextLine1 Text 135
8 225 45 65539 OOO_CONTROL_190
SetupCompleteError TextLine2 Text 135 55 228 25
65539 OOO_CONTROL_191
SetupCompleteSuccess Back PushButton 164 243 66 17
1 OOO_CONTROL_192 OK
SetupCompleteSuccess Cancel PushButton 301 243 66 17
1 OOO_CONTROL_193 Image
-SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10
9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back
-SetupCompleteSuccess CheckForUpdatesText Text 152 162 190
30 65538 OOO_CONTROL_194
-SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114
10 9 2 LAUNCHPROGRAM
-SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148
10 9 2 LAUNCHREADME
SetupCompleteSuccess DlgLine Line 0 234 374 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1
ImageBmp CheckBoxUpdates
-SetupCompleteSuccess LaunchProgramText Text 164 112 198
15 65538 OOO_CONTROL_195
-SetupCompleteSuccess LaunchReadmeText Text 164 148 198
13 65538 OOO_CONTROL_196
SetupCompleteSuccess OK PushButton 230 243 66 17
3 OOO_CONTROL_197 Cancel
SetupCompleteSuccess TextLine1 Text 135 8 225 45
65539 OOO_CONTROL_198
SetupCompleteSuccess TextLine2 Text 135 55 228 45
65538 OOO_CONTROL_199
SetupCompleteSuccess TextLine3 Text 135 55 228 45
65538 OOO_CONTROL_200
-SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45
65538 OOO_CONTROL_201
-SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45
65538 OOO_CONTROL_202
-SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45
65538 OOO_CONTROL_203
SetupError A PushButton 192 80 66 17 3
OOO_CONTROL_204
SetupError C PushButton 192 80 66 17 3
OOO_CONTROL_205
SetupError ErrorText Text 50 15 200 50 3
OOO_CONTROL_206
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
index 9adacf8..99e5224 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
@@ -29,17 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckForUpdatesText Show
ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index 285a77b..63ea995 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -99,8 +99,6 @@ SetupCompleteError Back EndDialog Return 1
2
SetupCompleteError Cancel [Suspend] 1 1 1
SetupCompleteError Cancel EndDialog Return 1 2
SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK DoAction CheckForProductUpdates
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT
ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4
-SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED
And NOT Installed And ACTION="INSTALL" 5
SetupCompleteSuccess OK EndDialog Exit 1 2
SetupError A EndDialog ErrorAbort 1 0
SetupError C EndDialog ErrorCancel 1 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 485f16c..cfa9084 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -421,15 +421,6 @@ en-US = "< &Back"
[OOO_CONTROL_193]
en-US = "Cancel"
-[OOO_CONTROL_194]
-en-US = "&Yes, check for program updates (Recommended) after the setup
completes."
-
-[OOO_CONTROL_195]
-en-US = "Launch the program"
-
-[OOO_CONTROL_196]
-en-US = "Show the readme file"
-
[OOO_CONTROL_197]
en-US = "&Finish"
@@ -442,15 +433,6 @@ en-US = "The Installation Wizard has successfully
installed [ProductName]. Click
[OOO_CONTROL_200]
en-US = "The Installation Wizard has successfully uninstalled [ProductName].
Click Finish to exit the wizard."
-[OOO_CONTROL_201]
-en-US = "Setup has finished installing [ProductName]."
-
-[OOO_CONTROL_202]
-en-US = "Some program files might have been updated since you purchased your
copy of [ProductName]."
-
-[OOO_CONTROL_203]
-en-US = "Your Internet connection can be used to make sure that you have the
latest updates."
-
[OOO_CONTROL_204]
en-US = "&Abort"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index e7f4169..2705fc3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -1,5 +1,4 @@
Property Value
s72 S64
CheckBox Property
-ISCHECKFORPRODUCTUPDATES 1
CREATEDESKTOPLINK 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 918f0a7..f929518 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -258,21 +258,12 @@ SetupCompleteError TextLine1 Text 135
8 225 45 65539 OOO_CONTROL_190
SetupCompleteError TextLine2 Text 135 55 228 25
65539 OOO_CONTROL_191
SetupCompleteSuccess Back PushButton 164 243 66 17
1 OOO_CONTROL_192 OK
SetupCompleteSuccess Cancel PushButton 301 243 66 17
1 OOO_CONTROL_193 Image
-SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10
9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back
-SetupCompleteSuccess CheckForUpdatesText Text 152 162 190
30 65538 OOO_CONTROL_194
-SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114
10 9 2 LAUNCHPROGRAM
-SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148
10 9 2 LAUNCHREADME
SetupCompleteSuccess DlgLine Line 0 234 374 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1
ImageBmp CheckBoxUpdates
-SetupCompleteSuccess LaunchProgramText Text 164 112 198
15 65538 OOO_CONTROL_195
-SetupCompleteSuccess LaunchReadmeText Text 164 148 198
13 65538 OOO_CONTROL_196
SetupCompleteSuccess OK PushButton 230 243 66 17
3 OOO_CONTROL_197 Cancel
SetupCompleteSuccess TextLine1 Text 135 8 225 45
65539 OOO_CONTROL_198
SetupCompleteSuccess TextLine2 Text 135 55 228 45
65538 OOO_CONTROL_199
SetupCompleteSuccess TextLine3 Text 135 55 228 45
65538 OOO_CONTROL_200
-SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45
65538 OOO_CONTROL_201
-SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45
65538 OOO_CONTROL_202
-SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45
65538 OOO_CONTROL_203
SetupError A PushButton 192 80 66 17 3
OOO_CONTROL_204
SetupError C PushButton 192 80 66 17 3
OOO_CONTROL_205
SetupError ErrorText Text 50 15 200 50 3
OOO_CONTROL_206
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 1b874bc..6239d90 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -36,17 +36,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckForUpdatesText Show
ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index a8bb1b5..ce1cb2b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -109,8 +109,6 @@ SetupCompleteError Back EndDialog Return 1
2
SetupCompleteError Cancel [Suspend] 1 1 1
SetupCompleteError Cancel EndDialog Return 1 2
SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK DoAction CheckForProductUpdates
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT
ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4
-SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED
And NOT Installed And ACTION="INSTALL" 5
SetupCompleteSuccess OK EndDialog Exit 1 2
SetupError A EndDialog ErrorAbort 1 0
SetupError C EndDialog ErrorCancel 1 0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06..0000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property Value
-s72 S64
-CheckBox Property
-ISCHECKFORPRODUCTUPDATES 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index 59c5b34..667eef0 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -251,21 +251,12 @@ SetupCompleteError TextLine1 Text 135
8 225 45 65539 OOO_CONTROL_190
SetupCompleteError TextLine2 Text 135 55 228 25
65539 OOO_CONTROL_191
SetupCompleteSuccess Back PushButton 164 243 66 17
1 OOO_CONTROL_192 OK
SetupCompleteSuccess Cancel PushButton 301 243 66 17
1 OOO_CONTROL_193 Image
-SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10
9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back
-SetupCompleteSuccess CheckForUpdatesText Text 152 162 190
30 65538 OOO_CONTROL_194
-SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114
10 9 2 LAUNCHPROGRAM
-SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148
10 9 2 LAUNCHREADME
SetupCompleteSuccess DlgLine Line 0 234 374 0 1
SetupCompleteSuccess Image Bitmap 0 0 125 234 1
ImageBmp CheckBoxUpdates
-SetupCompleteSuccess LaunchProgramText Text 164 112 198
15 65538 OOO_CONTROL_195
-SetupCompleteSuccess LaunchReadmeText Text 164 148 198
13 65538 OOO_CONTROL_196
SetupCompleteSuccess OK PushButton 230 243 66 17
3 OOO_CONTROL_197 Cancel
SetupCompleteSuccess TextLine1 Text 135 8 225 45
65539 OOO_CONTROL_198
SetupCompleteSuccess TextLine2 Text 135 55 228 45
65538 OOO_CONTROL_199
SetupCompleteSuccess TextLine3 Text 135 55 228 45
65538 OOO_CONTROL_200
-SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45
65538 OOO_CONTROL_201
-SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45
65538 OOO_CONTROL_202
-SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45
65538 OOO_CONTROL_203
SetupError A PushButton 192 80 66 17 3
OOO_CONTROL_204
SetupError C PushButton 192 80 66 17 3
OOO_CONTROL_205
SetupError ErrorText Text 50 15 200 50 3
OOO_CONTROL_206
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
index 9adacf8..99e5224 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
@@ -29,17 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckForUpdatesText Show
ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 6bd5f27..89c3e39 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -100,8 +100,6 @@ SetupCompleteError Back EndDialog Return 1
2
SetupCompleteError Cancel [Suspend] 1 1 1
SetupCompleteError Cancel EndDialog Return 1 2
SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK DoAction CheckForProductUpdates
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT
ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4
-SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED
And NOT Installed And ACTION="INSTALL" 5
SetupCompleteSuccess OK EndDialog Exit 1 2
SetupError A EndDialog ErrorAbort 1 0
SetupError C EndDialog ErrorCancel 1 0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06..0000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property Value
-s72 S64
-CheckBox Property
-ISCHECKFORPRODUCTUPDATES 1
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
index e046bb6..9d8cf5a 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
@@ -251,21 +251,12 @@ SetupCompleteError TextLine1 Text 135
8 225 45 65539 OOO_CONTROL_190
SetupCompleteError TextLine2 Text 135 55 228 25
65539 OOO_CONTROL_191
SetupCompleteSuccess Back PushButton 164 243 66 17
1 OOO_CONTROL_192 OK
SetupCompleteSuccess Cancel PushButton 301 243 66 17
1 OOO_CONTROL_193 Image
-SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10
9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back
-SetupCompleteSuccess CheckForUpdatesText Text 152 162 190
30 65538 OOO_CONTROL_194
-SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114
10 9 2 LAUNCHPROGRAM
-SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148
10 9 2 LAUNCHREADME
SetupCompleteSuccess DlgLine Line 0 234 374 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1
ImageBmp CheckBoxUpdates
-SetupCompleteSuccess LaunchProgramText Text 164 112 198
15 65538 OOO_CONTROL_195
-SetupCompleteSuccess LaunchReadmeText Text 164 148 198
13 65538 OOO_CONTROL_196
SetupCompleteSuccess OK PushButton 230 243 66 17
3 OOO_CONTROL_197 Cancel
SetupCompleteSuccess TextLine1 Text 135 8 225 45
65539 OOO_CONTROL_198
SetupCompleteSuccess TextLine2 Text 135 55 228 45
65538 OOO_CONTROL_199
SetupCompleteSuccess TextLine3 Text 135 55 228 45
65538 OOO_CONTROL_200
-SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45
65538 OOO_CONTROL_201
-SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45
65538 OOO_CONTROL_202
-SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45
65538 OOO_CONTROL_203
SetupError A PushButton 192 80 66 17 3
OOO_CONTROL_204
SetupError C PushButton 192 80 66 17 3
OOO_CONTROL_205
SetupError ErrorText Text 50 15 200 50 3
OOO_CONTROL_206
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
index 9adacf8..99e5224 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
@@ -29,17 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckForUpdatesText Show
ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1"
And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1"
And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT
ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR
(ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And
NOT Installed And ACTION="INSTALL"
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 6bd5f27..89c3e39 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -100,8 +100,6 @@ SetupCompleteError Back EndDialog Return 1
2
SetupCompleteError Cancel [Suspend] 1 1 1
SetupCompleteError Cancel EndDialog Return 1 2
SetupCompleteError Finish EndDialog Exit 1 2
-SetupCompleteSuccess OK DoAction CheckForProductUpdates
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT
ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4
-SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot
ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED
And NOT Installed And ACTION="INSTALL" 5
SetupCompleteSuccess OK EndDialog Exit 1 2
SetupError A EndDialog ErrorAbort 1 0
SetupError C EndDialog ErrorCancel 1 0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
