instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 18
----------
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 17
---------
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 17
---------
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 17
---------
instsetoo_native/inc_ure/windows/msi_templates/Control.idt | 17
---------
l10ntools/source/ulfconv/msi-encodinglist.txt | 2 -
solenv/bin/modules/installer.pm | 11
++++--
solenv/bin/modules/installer/windows/mergemodule.pm | 2 -
8 files changed, 10 insertions(+), 91 deletions(-)
New commits:
commit 0cacb528ffc9dc2beec84386150a063d86d36f3b
Author: Andras Timar <ati...@suse.com>
Date: Sun Sep 23 10:55:57 2012 +0200
set encoding of Hungarian MSI tables to UTF-8
needed for the word "Bokma°l"
Change-Id: Iea342161edbdf4983906d5859d279de3899a3839
diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt
b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 869dc09..8a3d4cb 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -66,7 +66,7 @@ he 1255 1037
hi 0 1081
hr 1250 1050 # Croatian
ht 1252 1626 # Haitian
-hu 1250 1038
+hu 0 1038
hy 0 1067 # Armenian
id 1252 1057 # Indonesian
is 1252 1039 # Icelandic
commit 44e46183cf0771ef872b89a164651109a2abb012
Author: Andras Timar <ati...@suse.com>
Date: Sun Sep 23 10:51:36 2012 +0200
fdo#54276 speed up packaging on Windows significantly
See the bug for more details.
Change-Id: I01aed95c204ebeffa9cd7678f698a100a836f267
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index acec0b6..c2cd8ab 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1683,9 +1683,6 @@ sub run {
installer::windows::msiglobal::write_summary_into_msi_database($msifilename,
$onelanguage, $languagefile, $allvariableshashref);
- # if there are Merge Modules, they have to be integrated
now
- $filesinproductlanguageresolvedarrayref =
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
$filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref,
$allvariableshashref, $includepatharrayref, $allupdatesequences,
$allupdatelastsequences, $allupdatediskids);
-
# copy msi database into installation directory
my $msidestfilename = $installdir .
$installer::globals::separator . $msidatabasename;
@@ -1704,6 +1701,14 @@ sub run {
{
installer::windows::msiglobal::create_transforms($languagesarrayref,
$defaultlanguage, $installdir, $allvariableshashref);
}
+ # if there are Merge Modules, they have to be integrated now
+ my $mergedbname =
installer::windows::msiglobal::get_msidatabasename($allvariableshashref,
$defaultlanguage);
+ my $mergeidtdir = $idtdirbase . $installer::globals::separator
. "mergemodules";
+ if ( -d $mergeidtdir ) {
installer::systemactions::remove_complete_directory($mergeidtdir, 1); }
+ installer::systemactions::create_directory($mergeidtdir);
+ installer::systemactions::copy_one_file($installdir .
$installer::globals::separator . $mergedbname, $mergeidtdir .
$installer::globals::separator . $mergedbname);
+ $filesinproductlanguageresolvedarrayref =
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
$filesinproductlanguageresolvedarrayref, $mergeidtdir .
$installer::globals::separator . $mergedbname, $languagestringref,
$allvariableshashref, $includepatharrayref, $allupdatesequences,
$allupdatelastsequences, $allupdatediskids);
+ installer::systemactions::copy_one_file($mergeidtdir .
$installer::globals::separator . $mergedbname, $installdir .
$installer::globals::separator . $mergedbname);
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage,
$installdir, $allvariableshashref);
}
commit 9783faa2a305c884bd80b0cc5238fb75a2ba29b9
Author: Andras Timar <ati...@suse.com>
Date: Sun Sep 23 10:41:34 2012 +0200
followup of bccb30a0
Change-Id: Ibf053d078ad048094527e4e25ee9499dbaacd007
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 5049007..495325e 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -3,7 +3,6 @@ s72 s50 s20 i2 i2 i2 i2 I4
S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
AdminChangeFolder BannerLine Line 0 44 374 0
1
-AdminChangeFolder Branding2 Text 3 228 140 13
65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80
458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_5 Combo
@@ -19,7 +18,6 @@ AdminChangeFolder Up PushButton 310 66
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line 0 44 374 0
1
-AdminNetworkLocation Branding2 Text 3 228 140 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_19
@@ -43,7 +41,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformation BannerLine Line 0 44 374 0
1
-CustomerInformation Branding2 Text 3 228 140 13
65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformation CompanyLabel Text 21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -58,7 +55,6 @@ CustomerInformation RadioGroup RadioButtonGroup
63 170 300 50 3 ApplicationUsers
CustomSetup Back PushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding2 Text 3 228 140 13 65537
[ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17
3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -76,7 +72,6 @@ CustomSetup Size Text 241 133 120 50
3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTips BannerLine Line 0 44 374 0
1
-CustomSetupTips Branding2 Text 3 228 140 13
65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 374 0 1
CustomSetupTips DlgTitle Text 13 6 280 25
65539 OOO_CONTROL_65
@@ -93,7 +88,6 @@ CustomSetupTips PartialText Text 60 130
300 20 3 OOO_CONTROL_73
DestinationFolder Back PushButton 164 243 66 17
3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 0 0 374 44 1
BannerBmp
DestinationFolder BannerLine Line 0 44 374 0
1
-DestinationFolder Branding2 Text 3 228 110 13
65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66
17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24
5242881 OpenFolderIco
@@ -111,7 +105,6 @@ DestinationFolder LabelInvalidDir2 Text 21
82 290 30 2 OOO_CONTROL_307
DestinationFolder LabelWrongProduct2 Text 21 82 290
30 2 OOO_CONTROL_306
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1
BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 374 0
1
-DiskSpaceRequirements Branding2 Text 3 228 140 13
65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539
OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 374 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3
OOO_CONTROL_97
@@ -120,7 +113,6 @@ DiskSpaceRequirements List VolumeCostList 8
55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17
3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1
BannerBmp
FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding2 Text 3 228 140 13 65537
[ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 374 0 1
FilesInUse DlgText Text 21 51 348 29 3
OOO_CONTROL_104
@@ -132,7 +124,6 @@ FilesInUse Retry PushButton 164 243 66
17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3
OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1
BannerBmp
FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding2 Text 3 228 140 13 65537
[ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3
OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10
3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10
3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -145,7 +136,6 @@ FileTypeDialog DlgTitle Text 13 6
280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3
OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
InstallChangeFolder BannerLine Line 0 44 374 0
1
-InstallChangeFolder Branding2 Text 3 228 110 13
65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 302 80
4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_113 Combo
@@ -169,7 +159,6 @@ LicenseAgreement Agree RadioButtonGroup 8
190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17
3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 0 0 374 44 1
BannerBmp
LicenseAgreement BannerLine Line 0 44 374 0
1
-LicenseAgreement Branding2 Text 3 228 140 13
65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17
3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 374 0 1
@@ -179,7 +168,6 @@ LicenseAgreement Next PushButton 230 243
66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17
3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1
BannerBmp
MaintenanceType BannerLine Line 0 44 374 0
1
-MaintenanceType Branding2 Text 3 228 140 13
65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17
3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 374 0 1
@@ -199,7 +187,6 @@ MaintenanceWelcome TextLine1 Text 135 8
225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50
65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1
BannerBmp
OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding2 Text 3 228 140 13 65537
[ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 374 0 1
OutOfSpace DlgText Text 21 51 326 43 3
OOO_CONTROL_154
@@ -216,7 +203,6 @@ PatchWelcome TextLine2 Text 135 54
228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3
OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding2 Text 3 228 140 13 65537
[ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3
OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1
@@ -229,7 +215,6 @@ ReadyToInstall InstallNow PushButton 230
243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding2 Text 3 228 140 13 65537
[ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3
OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 374 0 1
@@ -291,7 +276,6 @@ SetupProgress ActionText Text 59 100
275 12 3
SetupProgress Back PushButton 164 243 66 17 1
OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1
BannerBmp
SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Branding2 Text 3 228 140 13 65537
[ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3
OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538
OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538
OOO_CONTROL_235
@@ -317,7 +301,6 @@ SetupResume TextLine1 Text 135 8 225
45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3
OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1
BannerBmp
SetupType BannerLine Line 0 44 374 0 1
-SetupType Branding2 Text 3 228 140 13 65537
[ProductName]
SetupType Cancel PushButton 301 243 66 17 3
OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881
SetupCompleteIco
SetupType CompText Text 80 94 246 35 3
OOO_CONTROL_255
@@ -330,7 +313,6 @@ SetupType DlgTitle Text 13 6 280
25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3
OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264
120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1
OOO_CONTROL_262 Next
-SplashBitmap Branding2 Text 3 228 140 13 65537
[ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3
OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 374 0 1
SplashBitmap Image Bitmap 13 12 114 211 1
ImageBmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index aed29f7..f8a227c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -3,7 +3,6 @@ s72 s50 s20 i2 i2 i2 i2 I4
S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
AdminChangeFolder BannerLine Line 0 44 374 0
1
-AdminChangeFolder Branding2 Text 3 228 140 13
65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80
458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_5 Combo
@@ -19,7 +18,6 @@ AdminChangeFolder Up PushButton 310 66
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line 0 44 374 0
1
-AdminNetworkLocation Branding2 Text 3 228 140 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_19
@@ -43,7 +41,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformation BannerLine Line 0 44 374 0
1
-CustomerInformation Branding2 Text 3 228 140 13
65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformation CompanyLabel Text 21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -58,7 +55,6 @@ CustomerInformation RadioGroup RadioButtonGroup
63 170 300 50 3 ApplicationUsers
CustomSetup Back PushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding2 Text 3 228 140 13 65537
[ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17
3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -76,7 +72,6 @@ CustomSetup Size Text 241 133 120 50
3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTips BannerLine Line 0 44 374 0
1
-CustomSetupTips Branding2 Text 3 228 140 13
65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 374 0 1
CustomSetupTips DlgTitle Text 13 6 280 25
65539 OOO_CONTROL_65
@@ -93,7 +88,6 @@ CustomSetupTips PartialText Text 60 130
300 20 3 OOO_CONTROL_73
DestinationFolder Back PushButton 164 243 66 17
3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 0 0 374 44 1
BannerBmp
DestinationFolder BannerLine Line 0 44 374 0
1
-DestinationFolder Branding2 Text 3 228 110 13
65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66
17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24
5242881 OpenFolderIco
@@ -111,7 +105,6 @@ DestinationFolder LabelInvalidDir2 Text 21
82 290 30 2 OOO_CONTROL_307
DestinationFolder LabelWrongProduct2 Text 21 82 290
30 2 OOO_CONTROL_306
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1
BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 374 0
1
-DiskSpaceRequirements Branding2 Text 3 228 140 13
65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539
OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 374 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3
OOO_CONTROL_97
@@ -120,7 +113,6 @@ DiskSpaceRequirements List VolumeCostList 8
55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17
3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1
BannerBmp
FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding2 Text 3 228 140 13 65537
[ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 374 0 1
FilesInUse DlgText Text 21 51 348 29 3
OOO_CONTROL_104
@@ -132,7 +124,6 @@ FilesInUse Retry PushButton 164 243 66
17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3
OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1
BannerBmp
FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding2 Text 3 228 140 13 65537
[ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3
OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10
3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10
3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -145,7 +136,6 @@ FileTypeDialog DlgTitle Text 13 6
280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3
OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
InstallChangeFolder BannerLine Line 0 44 374 0
1
-InstallChangeFolder Branding2 Text 3 228 110 13
65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 302 80
4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_113 Combo
@@ -168,7 +158,6 @@ InstallWelcome TextLine2 Text 135 55
228 45 65539 OOO_CONTROL_127
MaintenanceType Back PushButton 164 243 66 17
3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1
BannerBmp
MaintenanceType BannerLine Line 0 44 374 0
1
-MaintenanceType Branding2 Text 3 228 140 13
65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17
3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 374 0 1
@@ -188,7 +177,6 @@ MaintenanceWelcome TextLine1 Text 135 8
225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50
65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1
BannerBmp
OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding2 Text 3 228 140 13 65537
[ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 374 0 1
OutOfSpace DlgText Text 21 51 326 43 3
OOO_CONTROL_154
@@ -205,7 +193,6 @@ PatchWelcome TextLine2 Text 135 54
228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3
OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding2 Text 3 228 140 13 65537
[ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3
OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1
@@ -218,7 +205,6 @@ ReadyToInstall InstallNow PushButton 230
243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding2 Text 3 228 140 13 65537
[ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3
OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 374 0 1
@@ -280,7 +266,6 @@ SetupProgress ActionText Text 59 100
275 12 3
SetupProgress Back PushButton 164 243 66 17 1
OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1
BannerBmp
SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Branding2 Text 3 228 140 13 65537
[ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3
OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538
OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538
OOO_CONTROL_235
@@ -306,7 +291,6 @@ SetupResume TextLine1 Text 135 8 225
45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3
OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1
BannerBmp
SetupType BannerLine Line 0 44 374 0 1
-SetupType Branding2 Text 3 228 140 13 65537
[ProductName]
SetupType Cancel PushButton 301 243 66 17 3
OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881
SetupCompleteIco
SetupType CompText Text 80 94 246 35 3
OOO_CONTROL_255
@@ -319,7 +303,6 @@ SetupType DlgTitle Text 13 6 280
25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3
OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264
120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1
OOO_CONTROL_262 Next
-SplashBitmap Branding2 Text 3 228 140 13 65537
[ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3
OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 374 0 1
SplashBitmap Image Bitmap 13 12 114 211 1
ImageBmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index ec33a3c..a9c739f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -3,7 +3,6 @@ s72 s50 s20 i2 i2 i2 i2 I4
S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
AdminChangeFolder BannerLine Line 0 44 374 0
1
-AdminChangeFolder Branding2 Text 3 228 88 13
65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80
458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_5 Combo
@@ -19,7 +18,6 @@ AdminChangeFolder Up PushButton 310 66
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line 0 44 374 0
1
-AdminNetworkLocation Branding2 Text 3 228 88 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_19
@@ -46,7 +44,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformation BannerLine Line 0 44 374 0
1
-CustomerInformation Branding2 Text 3 228 88 13
65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformation CompanyLabel Text 21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -61,7 +58,6 @@ CustomerInformation RadioGroup RadioButtonGroup
63 170 300 50 3 ApplicationUsers
CustomSetup Back PushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding2 Text 3 228 88 13 65537
[ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 164 203 66 17
3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -79,7 +75,6 @@ CustomSetup Size Text 241 148 120 65
3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTips BannerLine Line 0 44 374 0
1
-CustomSetupTips Branding2 Text 3 228 88 13
65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 374 0 1
CustomSetupTips DlgTitle Text 13 6 280 25
65539 OOO_CONTROL_65
@@ -95,7 +90,6 @@ CustomSetupTips OK PushButton 301 243
66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20
3 OOO_CONTROL_73
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1
BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 374 0
1
-DiskSpaceRequirements Branding2 Text 3 228 88 13
65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539
OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 374 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3
OOO_CONTROL_97
@@ -104,7 +98,6 @@ DiskSpaceRequirements List VolumeCostList 8
55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17
3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1
BannerBmp
FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding2 Text 3 228 88 13 65537
[ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 374 0 1
FilesInUse DlgText Text 21 51 348 29 3
OOO_CONTROL_104
@@ -116,7 +109,6 @@ FilesInUse Retry PushButton 164 243 66
17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3
OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1
BannerBmp
FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding2 Text 3 228 88 13 65537
[ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3
OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10
3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10
3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -130,7 +122,6 @@ FileTypeDialog DlgTitle Text 13 6
280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3
OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
InstallChangeFolder BannerLine Line 0 44 374 0
1
-InstallChangeFolder Branding2 Text 3 228 88 13
65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80
4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_113 Combo
@@ -158,7 +149,6 @@ LicenseAgreement Agree RadioButtonGroup 8
190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17
3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 0 0 374 44 1
BannerBmp
LicenseAgreement BannerLine Line 0 44 374 0
1
-LicenseAgreement Branding2 Text 3 228 88 13
65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17
3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_132
LicenseAgreement DlgLine Line 0 234 374 0 1
@@ -168,7 +158,6 @@ LicenseAgreement Next PushButton 230 243
66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17
3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1
BannerBmp
MaintenanceType BannerLine Line 0 44 374 0
1
-MaintenanceType Branding2 Text 3 228 88 13
65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17
3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 374 0 1
@@ -190,7 +179,6 @@ MaintenanceWelcome TextLine1 Text 135 8
225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50
65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1
BannerBmp
OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding2 Text 3 228 88 13 65537
[ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 374 0 1
OutOfSpace DlgText Text 21 51 326 43 3
OOO_CONTROL_154
@@ -207,7 +195,6 @@ PatchWelcome TextLine2 Text 135 54
228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3
OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding2 Text 3 228 88 13 65537
[ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3
OOO_CONTROL_166 DesktopLink
ReadyToInstall DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1
@@ -223,7 +210,6 @@ ReadyToInstall EnableQuickstart CheckBox
21 150 300 10 3 QUICKSTART OOO_CONTROL_
ReadyToRemove Back PushButton 164 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding2 Text 3 228 88 13 65537
[ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3
OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 374 0 1
@@ -285,7 +271,6 @@ SetupProgress ActionText Text 59 100
275 12 3
SetupProgress Back PushButton 164 243 66 17 1
OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1
BannerBmp
SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Branding2 Text 3 228 88 13 65537
[ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3
OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538
OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538
OOO_CONTROL_235
@@ -311,7 +296,6 @@ SetupResume TextLine1 Text 135 8 225
45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3
OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1
BannerBmp
SetupType BannerLine Line 0 44 374 0 1
-SetupType Branding2 Text 3 228 88 13 65537
[ProductName]
SetupType Cancel PushButton 301 243 66 17 3
OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881
SetupCompleteIco
SetupType CompText Text 80 94 246 35 3
OOO_CONTROL_255
@@ -324,7 +308,6 @@ SetupType DlgTitle Text 13 6 280
25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3
OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264
120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1
OOO_CONTROL_262 Next
-SplashBitmap Branding2 Text 3 228 88 13 65537
[ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3
OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 374 0 1
SplashBitmap Image Bitmap 13 12 114 211 1
ImageBmp
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index b578081..41a9bbd 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -3,7 +3,6 @@ s72 s50 s20 i2 i2 i2 i2 I4
S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
AdminChangeFolder BannerLine Line 0 44 374 0
1
-AdminChangeFolder Branding2 Text 3 228 92 13
65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80
458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_5 Combo
@@ -19,7 +18,6 @@ AdminChangeFolder Up PushButton 310 66
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line 0 44 374 0
1
-AdminNetworkLocation Branding2 Text 3 228 92 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_19
@@ -43,7 +41,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformation BannerLine Line 0 44 374 0
1
-CustomerInformation Branding2 Text 3 228 92 13
65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformation CompanyLabel Text 21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -58,7 +55,6 @@ CustomerInformation RadioGroup RadioButtonGroup
63 170 300 50 3 ApplicationUsers
CustomSetup Back PushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding2 Text 3 228 92 13 65537
[ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17
3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -76,7 +72,6 @@ CustomSetup Size Text 241 133 120 50
3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTips BannerLine Line 0 44 374 0
1
-CustomSetupTips Branding2 Text 3 228 92 13
65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 374 0 1
CustomSetupTips DlgTitle Text 13 6 280 25
65539 OOO_CONTROL_65
@@ -93,7 +88,6 @@ CustomSetupTips PartialText Text 60 130
300 20 3 OOO_CONTROL_73
DestinationFolder Back PushButton 164 243 66 17
3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 0 0 374 44 1
BannerBmp
DestinationFolder BannerLine Line 0 44 374 0
1
-DestinationFolder Branding2 Text 3 228 92 13
65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66
17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24
5242881 OpenFolderIco
@@ -105,7 +99,6 @@ DestinationFolder LocLabel Text 57 52
290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17
3 OOO_CONTROL_93 Cancel
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1
BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 374 0
1
-DiskSpaceRequirements Branding2 Text 3 228 92 13
65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539
OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 374 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3
OOO_CONTROL_97
@@ -114,7 +107,6 @@ DiskSpaceRequirements List VolumeCostList 8
55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17
3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1
BannerBmp
FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding2 Text 3 228 92 13 65537
[ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 374 0 1
FilesInUse DlgText Text 21 51 348 29 3
OOO_CONTROL_104
@@ -126,7 +118,6 @@ FilesInUse Retry PushButton 164 243 66
17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3
OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1
BannerBmp
FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding2 Text 3 228 92 13 65537
[ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3
OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10
3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10
3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -139,7 +130,6 @@ FileTypeDialog DlgTitle Text 13 6
280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3
OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
InstallChangeFolder BannerLine Line 0 44 374 0
1
-InstallChangeFolder Branding2 Text 3 228 92 13
65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80
4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_113 Combo
@@ -163,7 +153,6 @@ InstallWelcome TextLine2 Text 135 55
228 45 65539 OOO_CONTROL_127
MaintenanceType Back PushButton 164 243 66 17
3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1
BannerBmp
MaintenanceType BannerLine Line 0 44 374 0
1
-MaintenanceType Branding2 Text 3 228 92 13
65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17
3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 374 0 1
@@ -185,7 +174,6 @@ MaintenanceWelcome TextLine1 Text 135 8
225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50
65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1
BannerBmp
OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding2 Text 3 228 92 13 65537
[ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 374 0 1
OutOfSpace DlgText Text 21 51 326 43 3
OOO_CONTROL_154
@@ -202,7 +190,6 @@ PatchWelcome TextLine2 Text 135 54
228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3
OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding2 Text 3 228 92 13 65537
[ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3
OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1
@@ -215,7 +202,6 @@ ReadyToInstall InstallNow PushButton 230
243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding2 Text 3 228 92 13 65537
[ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3
OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 374 0 1
@@ -277,7 +263,6 @@ SetupProgress ActionText Text 59 100
275 12 3
SetupProgress Back PushButton 164 243 66 17 1
OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1
BannerBmp
SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Branding2 Text 3 228 92 13 65537
[ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3
OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538
OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538
OOO_CONTROL_235
@@ -303,7 +288,6 @@ SetupResume TextLine1 Text 135 8 225
45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3
OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1
BannerBmp
SetupType BannerLine Line 0 44 374 0 1
-SetupType Branding2 Text 3 228 92 13 65537
[ProductName]
SetupType Cancel PushButton 301 243 66 17 3
OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881
SetupCompleteIco
SetupType CompText Text 80 94 246 35 3
OOO_CONTROL_255
@@ -316,7 +300,6 @@ SetupType DlgTitle Text 13 6 280
25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3
OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264
120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1
OOO_CONTROL_262 Next
-SplashBitmap Branding2 Text 3 228 92 13 65537
[ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3
OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 374 0 1
SplashBitmap Image Bitmap 13 12 113 211 1
ImageBmp
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
index 4613cc1..239267d 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
@@ -3,7 +3,6 @@ s72 s50 s20 i2 i2 i2 i2 I4
S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
AdminChangeFolder BannerLine Line 0 44 374 0
1
-AdminChangeFolder Branding2 Text 3 228 32 13
65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80
458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_5 Combo
@@ -19,7 +18,6 @@ AdminChangeFolder Up PushButton 310 66
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line 0 44 374 0
1
-AdminNetworkLocation Branding2 Text 3 228 32 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_19
@@ -43,7 +41,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformation BannerLine Line 0 44 374 0
1
-CustomerInformation Branding2 Text 3 228 32 13
65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformation CompanyLabel Text 21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -58,7 +55,6 @@ CustomerInformation RadioGroup RadioButtonGroup
63 170 300 50 3 ApplicationUsers
CustomSetup Back PushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding2 Text 3 228 32 13 65537
[ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17
3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -76,7 +72,6 @@ CustomSetup Size Text 241 133 120 50
3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTips BannerLine Line 0 44 374 0
1
-CustomSetupTips Branding2 Text 3 228 32 13
65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_64
CustomSetupTips DlgLine Line 0 234 374 0 1
CustomSetupTips DlgTitle Text 13 6 280 25
65539 OOO_CONTROL_65
@@ -93,7 +88,6 @@ CustomSetupTips PartialText Text 60 130
300 20 3 OOO_CONTROL_73
DestinationFolder Back PushButton 164 243 66 17
3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 0 0 374 44 1
BannerBmp
DestinationFolder BannerLine Line 0 44 374 0
1
-DestinationFolder Branding2 Text 3 228 32 13
65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66
17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24
5242881 OpenFolderIco
@@ -105,7 +99,6 @@ DestinationFolder LocLabel Text 57 52
290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17
3 OOO_CONTROL_93 Cancel
DiskSpaceRequirements Banner Bitmap 0 0 374 44 1
BannerBmp
DiskSpaceRequirements BannerLine Line 0 44 374 0
1
-DiskSpaceRequirements Branding2 Text 3 228 32 13
65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539
OOO_CONTROL_96
DiskSpaceRequirements DlgLine Line 0 234 374 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3
OOO_CONTROL_97
@@ -114,7 +107,6 @@ DiskSpaceRequirements List VolumeCostList 8
55 358 125 393223 {120}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17
3 OOO_CONTROL_100
FilesInUse Banner Bitmap 0 0 374 44 1
BannerBmp
FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding2 Text 3 228 32 13 65537
[ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_103
FilesInUse DlgLine Line 0 234 374 0 1
FilesInUse DlgText Text 21 51 348 29 3
OOO_CONTROL_104
@@ -126,7 +118,6 @@ FilesInUse Retry PushButton 164 243 66
17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3
OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 0 0 374 44 1
BannerBmp
FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding2 Text 3 228 32 13 65537
[ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3
OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10
3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10
3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
@@ -139,7 +130,6 @@ FileTypeDialog DlgTitle Text 13 6
280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3
OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 0 0 374 44 1
BannerBmp
InstallChangeFolder BannerLine Line 0 44 374 0
1
-InstallChangeFolder Branding2 Text 3 228 32 13
65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80
4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14
3 OOO_CONTROL_113 Combo
@@ -163,7 +153,6 @@ InstallWelcome TextLine2 Text 135 55
228 45 65539 OOO_CONTROL_127
MaintenanceType Back PushButton 164 243 66 17
3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 0 0 374 44 1
BannerBmp
MaintenanceType BannerLine Line 0 44 374 0
1
-MaintenanceType Branding2 Text 3 228 32 13
65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17
3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 374 0 1
@@ -185,7 +174,6 @@ MaintenanceWelcome TextLine1 Text 135 8
225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50
65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 0 0 374 44 1
BannerBmp
OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding2 Text 3 228 32 13 65537
[ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_153
OutOfSpace DlgLine Line 0 234 374 0 1
OutOfSpace DlgText Text 21 51 326 43 3
OOO_CONTROL_154
@@ -202,7 +190,6 @@ PatchWelcome TextLine2 Text 135 54
228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3
OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding2 Text 3 228 32 13 65537
[ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3
OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1
@@ -215,7 +202,6 @@ ReadyToInstall InstallNow PushButton 230
243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding2 Text 3 228 32 13 65537
[ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3
OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539
OOO_CONTROL_178
ReadyToRemove DlgLine Line 0 234 374 0 1
@@ -277,7 +263,6 @@ SetupProgress ActionText Text 59 100
275 12 3
SetupProgress Back PushButton 164 243 66 17 1
OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 0 0 374 44 1
BannerBmp
SetupProgress BannerLine Line 0 44 374 0 1
-SetupProgress Branding2 Text 3 228 32 13 65537
[ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3
OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538
OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538
OOO_CONTROL_235
@@ -303,7 +288,6 @@ SetupResume TextLine1 Text 135 8 225
45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3
OOO_CONTROL_251 Next
SetupType Banner Bitmap 0 0 374 44 1
BannerBmp
SetupType BannerLine Line 0 44 374 0 1
-SetupType Branding2 Text 3 228 32 13 65537
[ProductName]
SetupType Cancel PushButton 301 243 66 17 3
OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881
SetupCompleteIco
SetupType CompText Text 80 94 246 35 3
OOO_CONTROL_255
@@ -316,7 +300,6 @@ SetupType DlgTitle Text 13 6 280
25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3
OOO_CONTROL_260 Cancel
SetupType RadioGroup RadioButtonGroup 21 79 264
120 3 _IsSetupTypeMin Back
SplashBitmap Back PushButton 164 243 66 17 1
OOO_CONTROL_262 Next
-SplashBitmap Branding2 Text 3 228 32 13 65537
[ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3
OOO_CONTROL_265 Back
SplashBitmap DlgLine Line 0 234 374 0 1
SplashBitmap Image Bitmap 13 12 114 211 1
ImageBmp
commit 05dd0f135757b1e7393f31a4dc8f42e5943b91ee
Author: Andras Timar <ati...@suse.com>
Date: Sat Sep 22 17:28:09 2012 +0200
merge_mergemodules_into_msi_database: ditch unused function arguments
Change-Id: I33ea8817dcbd184cf824fc7252def5e3e9dfa3da
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 287291a..acec0b6 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1684,7 +1684,7 @@ sub run {
installer::windows::msiglobal::write_summary_into_msi_database($msifilename,
$onelanguage, $languagefile, $allvariableshashref);
# if there are Merge Modules, they have to be integrated
now
- $filesinproductlanguageresolvedarrayref =
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
$filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref,
$onelanguage, $languagefile, $allvariableshashref, $includepatharrayref,
$allupdatesequences, $allupdatelastsequences, $allupdatediskids);
+ $filesinproductlanguageresolvedarrayref =
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
$filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref,
$allvariableshashref, $includepatharrayref, $allupdatesequences,
$allupdatelastsequences, $allupdatediskids);
# copy msi database into installation directory
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm
b/solenv/bin/modules/installer/windows/mergemodule.pm
index bc12e11..f4e5951 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -48,7 +48,7 @@ use installer::windows::language;
sub merge_mergemodules_into_msi_database
{
- my ($mergemodules, $filesref, $msifilename, $languagestringref, $language,
$languagefile, $allvariables, $includepatharrayref, $allupdatesequences,
$allupdatelastsequences, $allupdatediskids) = @_;
+ my ($mergemodules, $filesref, $msifilename, $languagestringref,
$allvariables, $includepatharrayref, $allupdatesequences,
$allupdatelastsequences, $allupdatediskids) = @_;
my $domerge = 0;
if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( !
$installer::globals::languagepack ) && ( ! $installer::globals::helppack )) {
$domerge = 1; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
