[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 --- instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt|2 -- instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_ure/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt |2 -- 11 files changed, 23 deletions(-) New commits: commit dd27492325a073b0a72d751635226cf4130af474 Author: Andras Timar ati...@suse.com Date: Tue Mar 20 14:05:36 2012 +0100 LibreOffice installer does not need Serial number diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index e5be5e4..92b5130 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -58,8 +58,6 @@ CustomerInformation NameEditEdit21 63 237 17 3 USERNAMEOOO_CONTROL_41 Company CustomerInformationNameLabel Text21 52 75 10 3 OOO_CONTROL_42 NameEdit CustomerInformationNextPushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel CustomerInformationRadioGroup RadioButtonGroup63 170 300 50 3 ApplicationUsersBack -CustomerInformationSerialLabel Text21 127 109 10 2 OOO_CONTROL_45 SerialNumber -CustomerInformationSerialNumberMaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup CustomSetupBackPushButton 164 243 66 17 3 OOO_CONTROL_46 Next CustomSetupBanner Bitmap 297 0 77 44 1 BannerBmp CustomSetupBannerLine Line0 44 374 0 1 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt index 6f6e3cb..f3a286b 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt @@ -7,8 +7,6 @@ CustomerInformation DlgRadioGroupText Hide Version9X CustomerInformationRadioGroup HideNOT Privileged CustomerInformationRadioGroup HideProductState 0 CustomerInformationRadioGroup HideVersion9X -CustomerInformationSerialLabel ShowSERIALNUMSHOW -CustomerInformationSerialNumberShowSERIALNUMSHOW CustomSetupChangeFolderHideInstalled CustomSetupDetails HideInstalled CustomSetupInstallLabelHideInstalled diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index e5be5e4..92b5130 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -58,8 +58,6 @@ CustomerInformation NameEditEdit21 63 237 17 3 USERNAMEOOO_CONTROL_41 Company CustomerInformationNameLabel Text21 52 75 10 3 OOO_CONTROL_42 NameEdit CustomerInformationNextPushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel CustomerInformationRadioGroup RadioButtonGroup63 170 300 50 3 ApplicationUsersBack -CustomerInformationSerialLabel Text21 127 109 10 2 OOO_CONTROL_45 SerialNumber -CustomerInformationSerialNumberMaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup CustomSetupBackPushButton 164 243 66 17 3 OOO_CONTROL_46 Next CustomSetupBanner Bitmap 297 0 77 44 1 BannerBmp CustomSetupBannerLine Line0 44 374 0 1 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt |3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit ea3967103430b96e5cd2c4d201840a0d827d9d76
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 21:41:49 2012 +0100
remove last traces of serial number check from MSI
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 3eb1b85..b32bd00 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -22,8 +22,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 05254de..e0476e9 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 ---
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_ure/windows/msi_templates/Control.idt |1 -
6 files changed, 8 deletions(-)
New commits:
commit 90ec7ecb86f4cc2005ac1c5a7e70b19fbdc02426
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 21:55:28 2012 +0100
remove last traces of serial number check from MSI
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 249120b..5c54cc9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -76,9 +76,6 @@ en-US = Back
[OOO_CONTROL_35]
en-US = Cancel
-[OOO_CONTROL_36]
-en-US = {\Tahoma8}{80}
-
[OOO_CONTROL_37]
en-US = Organization:
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7599ae5..05a7a79 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_ure/windows/msi_templates/Control.idt |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8941a9ad0173f10b5d7cf4c7d254d79c886f36b2
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 22:50:14 2012 +0100
fix control order in MSI, this time for real
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index acd4bd0..240b178 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line90 234 284 0 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
