diff options
44 files changed, 125 insertions, 296 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index 495325ecc999..55f1fcfe6b20 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 -WINDOWSENCODINGTEMPLATE Control Dialog_ Control +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index a4b5edc3b9a1..b8a970ced0c2 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Reinstall _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt index ddbf7e1ccb8c..287f33df9ee9 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Reinstall 0 0 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 2 Remove 0 60 290 14 OOO_RADIOBUTTON_3 _IsSetupTypeMin 1 Typical 0 0 264 14 OOO_RADIOBUTTON_4 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index f8a227cd179b..23a5d5995e6c 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 -WINDOWSENCODINGTEMPLATE Control Dialog_ Control +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt index a4b5edc3b9a1..b8a970ced0c2 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Reinstall _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt index ddbf7e1ccb8c..287f33df9ee9 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Reinstall 0 0 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 2 Remove 0 60 290 14 OOO_RADIOBUTTON_3 _IsSetupTypeMin 1 Typical 0 0 264 14 OOO_RADIOBUTTON_4 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf deleted file mode 100644 index 46e84bfe7876..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf +++ /dev/null @@ -1,12 +0,0 @@ -[OOO_SIS_TITLE] -en-US = "Installation database" - -[OOO_SIS_COMMENT] -en-US = "This installer database contains the logic and data required to install [ProductName]." - -[OOO_SIS_KEYWORDS] -en-US = "Install,MSI" - -[OOO_SIS_APPNAME] -en-US = "Windows Installer" - diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk index 2b7e1beafda2..36bc2647a3e1 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk @@ -44,7 +44,6 @@ ULFFILES = \ LaunchCo.ulf \ Property.ulf \ RadioBut.ulf \ - SIS.ulf \ UIText.ulf MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf) diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index a9c739f43f7b..a9fc6d22c616 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 -WINDOWSENCODINGTEMPLATE Control Dialog_ Control +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index a1cb18aede44..44d2c381c432 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Change _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index e1d000070427..a08edf3a734c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1 _IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index 41a9bbdb739a..9bc37a8ed840 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 -WINDOWSENCODINGTEMPLATE Control Dialog_ Control +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt index 6514eaaeca95..cdcaea4c609f 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Change _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt index e1d000070427..a08edf3a734c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1 _IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt index ec6ecdd99f72..becf9cc7aeb5 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt @@ -1,6 +1,6 @@ Action Description Template s72 L0 L0 -WINDOWSENCODINGTEMPLATE ActionText Action +65001 ActionText Action Advertise OOO_ACTIONTEXT_1 AllocateRegistrySpace OOO_ACTIONTEXT_2 OOO_ACTIONTEXT_3 AppSearch OOO_ACTIONTEXT_4 OOO_ACTIONTEXT_5 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt index 239267d57b52..a4aa33a7633d 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt @@ -1,6 +1,6 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 -WINDOWSENCODINGTEMPLATE Control Dialog_ Control +65001 Control Dialog_ Control AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp AdminChangeFolder BannerLine Line 0 44 374 0 1 AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Error.idt b/instsetoo_native/inc_ure/windows/msi_templates/Error.idt index 9789d0cf56f3..2f3a5912817d 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Error.idt @@ -1,6 +1,6 @@ Error Message i2 L0 -WINDOWSENCODINGTEMPLATE Error Error +65001 Error Error 0 OOO_ERROR_1 1 OOO_ERROR_2 2 OOO_ERROR_3 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt index 35d78694a664..e4d3f330b006 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 -WINDOWSENCODINGTEMPLATE LaunchCondition Condition +65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt index e296bb7543a2..0fbd08534096 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt @@ -1,6 +1,6 @@ Property Value s72 l0 -WINDOWSENCODINGTEMPLATE Property Property +65001 Property Property _IsMaintenance Change _IsSetupTypeMin Typical AgreeToLicense No diff --git a/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt index e1d000070427..a08edf3a734c 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt @@ -1,6 +1,6 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 -WINDOWSENCODINGTEMPLATE RadioButton Property Order +65001 RadioButton Property Order _IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1 _IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2 _IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt index ea581bff4601..82edac4d4e39 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt @@ -1,6 +1,6 @@ Key Text s72 L255 -WINDOWSENCODINGTEMPLATE UIText Key +65001 UIText Key AbsentPath bytes OOO_UITEXT_1 GB OOO_UITEXT_2 diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 8a3d4cbceb19..113f4a40f84a 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -16,62 +16,64 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# Syntax: language ANSI-Codepage LCID +# Syntax: language 0 LCID +# 2nd field used to be the ANSI codepage, +# but now we are using UTF-8 everywhere. # comment lines begin with hash -af 1252 1078 # Afrikaans +af 0 1078 # Afrikaans am 0 1118 # Amharic -ar 1256 1025 -ar-SA 1256 1025 +ar 0 1025 +ar-SA 0 1025 as 0 1101 # Assamese as-IN 0 1101 # Assamese -ast 1252 1610 -be 1251 1059 # Belarusian -be-BY 1251 1059 -bg 1251 1026 # Bulgarian +ast 0 1610 +be 0 1059 # Belarusian +be-BY 0 1059 +bg 0 1026 # Bulgarian bn 0 2117 # Bengali bn-BD 0 2117 # Bengali Bangladesh bn-IN 0 1093 # Bengali India bo 0 2121 -br 1252 1150 # Breton +br 0 1150 # Breton brx 0 1603 # Bodo (India) bs 0 5146 # bosnian -ca 1252 1027 # Catalan -ca-XV 1252 32771 # Catalan Valencian -cs 1250 1029 # Czech -cy 1252 1106 # Welsh -da 1252 1030 -de 1252 1031 +ca 0 1027 # Catalan +ca-XV 0 32771 # Catalan Valencian +cs 0 1029 # Czech +cy 0 1106 # Welsh +da 0 1030 +de 0 1031 dgo 0 1604 # Dogri (India) dz 0 2129 # Dzongkha (same ID as tibetan bhutan (s. i40713)) -el 1253 1032 -en-GB 1252 2057 -en-US 1252 1033 -en-ZA 1252 7177 +el 0 1032 +en-GB 0 2057 +en-US 0 1033 +en-ZA 0 7177 eo 0 1553 # Esperanto -es 1252 1034 -et 1257 1061 -eu 1252 1069 # Basque +es 0 1034 +et 0 1061 +eu 0 1069 # Basque fa 0 1065 # Farsi -fi 1252 1035 -fo 1252 1080 # Faroese -fr 1252 1036 -fr-CA 1252 3084 +fi 0 1035 +fo 0 1080 # Faroese +fr 0 1036 +fr-CA 0 3084 fur 0 1585 ga 0 2108 # Irish gd 0 1084 # Gaelic (Scotland) -gl 1252 1110 # Galician +gl 0 1110 # Galician gu 0 1095 # Gujarati gu-IN 0 1095 # Gujarati -he 1255 1037 +he 0 1037 hi 0 1081 -hr 1250 1050 # Croatian -ht 1252 1626 # Haitian +hr 0 1050 # Croatian +ht 0 1626 # Haitian hu 0 1038 hy 0 1067 # Armenian -id 1252 1057 # Indonesian -is 1252 1039 # Icelandic -it 1252 1040 -ja 932 1041 +id 0 1057 # Indonesian +is 0 1039 # Icelandic +it 0 1040 +ja 0 1041 jbo 0 1624 ka 0 1079 # Georgian kab 0 1625 @@ -79,18 +81,18 @@ kk 0 1087 km 0 1107 # Khmer kn 0 1099 # Kannada kn-IN 0 1099 # Kannada -ko 949 1042 +ko 0 1042 kok 0 1111 # Konkani ks 0 1120 # Kashmiri ku 0 1574 ky 0 1088 # Kyrgyz ky-CN 0 1640 # Kyrgyz (China) -lb 1252 1134 +lb 0 1134 lo 0 1108 # Lao -lt 1257 1063 # Lithuanian -lv 1257 1062 # Latvian +lt 0 1063 # Lithuanian +lv 0 1062 # Latvian mai 0 1605 # Maithili (India) -mk 1251 1071 # Macedonian +mk 0 1071 # Macedonian ml 0 1100 ml-IN 0 1100 mn 0 1104 # Mongolian @@ -101,70 +103,70 @@ mr-IN 0 1102 ms 0 1086 # Malay (Malaysian) mt 0 1082 # Maltese my 0 1109 # Burmese -nb 1252 1044 +nb 0 1044 ne 0 1121 # Nepali -nl 1252 1043 -nn 1252 2068 -no 1252 1044 +nl 0 1043 +nn 0 2068 +no 0 1044 nr 0 1580 # Ndebele South nso 0 1132 ny 0 1598 -oc 1252 1154 # Occitan-lengadocian +oc 0 1154 # Occitan-lengadocian om 0 2162 or 0 1096 # Oriya or-IN 0 1096 pa-IN 0 1094 # Punjabi pap 0 2171 -pl 1250 1045 +pl 0 1045 ps 0 2171 -pt 1252 2070 -pt-BR 1252 1046 -pt-PT 1252 2070 -qtz 1252 1033 # key id pseudo language +pt 0 2070 +pt-BR 0 1046 +pt-PT 0 2070 +qtz 0 1033 # key id pseudo language rm 0 1047 # Raeto-Romance ro 0 1048 # Romanian -ru 1251 1049 +ru 0 1049 rw 0 1569 # Kinyarwanda sa-IN 0 1103 # Sanskrit sat 0 1606 # Santali sb 0 1070 # Sorbian sc 0 3047 sd 0 1113 # Sindhi -sh 1250 2074 # Serbian Latin +sh 0 2074 # Serbian Latin si 0 2133 -sk 1250 1051 # Slovak -sl 1250 1060 # Slovenian -sq 1250 1052 # Albanian -sr 1251 3098 # Serbian Cyrillic -sr-SP 1251 3098 # Serbian Cyrillic +sk 0 1051 # Slovak +sl 0 1060 # Slovenian +sq 0 1052 # Albanian +sr 0 3098 # Serbian Cyrillic +sr-SP 0 3098 # Serbian Cyrillic ss 0 1579 # Swazi st 0 1072 # Southern Sotho, Sutu -sv 1252 1053 -sw 1252 1089 # Swahili -sw-TZ 1252 1089 # Swahili +sv 0 1053 +sw 0 1089 # Swahili +sw-TZ 0 1089 # Swahili so 0 1143 ta 0 1097 # Tamil ta-IN 0 1097 # Tamil te 0 1098 te-IN 0 1098 tg 0 1064 # Tajik -th 874 1054 +th 0 1054 ti 0 1139 # Tigrinya ti-ER 0 1139 # Tigrinya tn 0 1074 # Setsuana -tr 1254 1055 # Turkish +tr 0 1055 # Turkish ts 0 1073 # Tsonga tk 0 1090 -tt 1251 1092 # Tatar +tt 0 1092 # Tatar ug 0 1152 -uk 1251 1058 # Ukrainian -ur 1256 1056 # Urdu +uk 0 1058 # Ukrainian +ur 0 1056 # Urdu ur-IN 0 2080 uz 0 1091 # Uzbek (Latin) ve 0 1075 # Venda -vi 1258 1066 # Vietnamese +vi 0 1066 # Vietnamese xh 0 1076 # Xhosa yi 0 1085 # Yiddish -zh-CN 936 2052 -zh-TW 950 1028 +zh-CN 0 2052 +zh-TW 0 1028 zu 0 1077 # Zulu diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index c2cd8ab8cbbc..025d47189305 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -297,10 +297,10 @@ sub run { if ($installer::globals::languages_defined_in_productlist) { installer::languages::get_info_about_languages($allsettingsarrayref); } ##################################### - # Windows requires the encoding list + # Windows requires the LCID list ##################################### - if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodinglist($includepatharrayref); } + if ( $installer::globals::iswindowsbuild ) { installer::control::read_lcidlist($includepatharrayref); } ##################################################################### # Including additional inc files for variable settings, if defined @@ -1603,15 +1603,10 @@ sub run { push(@installer::globals::logfileinfo, $infoline); } - # setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE) - - installer::windows::idtglobal::setencoding($languageidtdir, $onelanguage); - # setting bidi attributes, if required - if ( $is_rtl ) { installer::windows::idtglobal::setbidiattributes($languageidtdir, $onelanguage); } - # setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE) + # setting the condition, that at least one module is selected installer::windows::idtglobal::set_multilanguageonly_condition($languageidtdir); # include the license text into the table Control.idt @@ -1679,8 +1674,6 @@ sub run { # validating the database # ToDo - my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.mlf"); - installer::windows::msiglobal::write_summary_into_msi_database($msifilename, $onelanguage, $languagefile, $allvariableshashref); # copy msi database into installation directory diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 7975bd926fd0..78b055bca986 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -408,53 +408,41 @@ sub check_logfile } ############################################################# -# Reading the Windows list file for language encodings +# Reading the Windows list file for Windows language codes +# Encoding field is no longer used. We use UTF-8 everywhere. ############################################################# -sub read_encodinglist +sub read_lcidlist { my ($patharrayref) = @_; + my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::lcidlistname, $patharrayref , 0); - my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::encodinglistname, $patharrayref , 0); + if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); } - if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows encoding list $installer::globals::encodinglistname!", "read_encodinglist"); } - - my $infoline = "Found encoding file: $$fileref\n"; + my $infoline = "Found LCID file: $$fileref\n"; push(@installer::globals::globallogfileinfo, $infoline); - my $encodinglist = installer::files::read_file($$fileref); - - my %msiencoding = (); + my $lcidlist = installer::files::read_file($$fileref); my %msilanguage = (); - # Controlling the encoding list - - for ( my $i = 0; $i <= $#{$encodinglist}; $i++ ) + for ( my $i = 0; $i <= $#{$lcidlist}; $i++ ) { - my $line = ${$encodinglist}[$i]; + my $line = ${$lcidlist}[$i]; if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line - if ( $line =~ /^$/ ) { next; } # this is an empty line - if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; } # removing comments after "#" - if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ ) { my $onelanguage = $1; - my $codepage = $2; my $windowslanguage = $3; - - $msiencoding{$onelanguage} = $codepage; $msilanguage{$onelanguage} = $windowslanguage; } else { - installer::exiter::exit_program("ERROR: Wrong syntax in Windows encoding list $installer::globals::encodinglistname in line $i.", "read_encodinglist"); + installer::exiter::exit_program("ERROR: Wrong syntax in Windows LCID list $installer::globals::lcidlistname in line $i.", "read_lcidlist"); } } - - $installer::globals::msiencoding = \%msiencoding; $installer::globals::msilanguage = \%msilanguage; } diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index ab570e580077..23ac86e304ee 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -87,8 +87,7 @@ BEGIN $templatefoldername = "Templates"; $programmenufolder = "ProgramMenuFolder"; $systemfolder = "SystemFolder"; - $encodinglistname = "msi-encodinglist.txt"; - $msiencoding = ""; # hash reference for msi encodings + $lcidlistname = "msi-encodinglist.txt"; $msilanguage = ""; # hash reference for msi languages LCID $sofficeiconadded = 0; $temppath = ""; diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index da70c1139234..b29004e4fb55 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -440,7 +440,7 @@ sub write_idt_header push(@{$idtref}, $oneline); $oneline = "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"; push(@{$idtref}, $oneline); - $oneline = "WINDOWSENCODINGTEMPLATE\tFeature\tFeature\n"; + $oneline = "65001\tFeature\tFeature\n"; push(@{$idtref}, $oneline); } @@ -480,7 +480,7 @@ sub write_idt_header push(@{$idtref}, $oneline); $oneline = "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n"; push(@{$idtref}, $oneline); - $oneline = "WINDOWSENCODINGTEMPLATE\tShortcut\tShortcut\n"; + $oneline = "65001\tShortcut\tShortcut\n"; push(@{$idtref}, $oneline); } @@ -1357,35 +1357,6 @@ sub include_subdir_into_componenttable } ################################################################## -# Setting the encoding in all idt files. Replacing the -# variable WINDOWSENCODINGTEMPLATE -################################################################## - -sub setencoding -{ - my ( $languageidtdir, $onelanguage ) = @_; - - my $encoding = installer::windows::language::get_windows_encoding($onelanguage); - - # collecting all idt files in the directory $languageidtdir and substituting the string - - my $idtfiles = installer::systemactions::find_file_with_file_extension("idt", $languageidtdir); - - for ( my $i = 0; $i <= $#{$idtfiles}; $i++ ) - { - my $onefilename = $languageidtdir . $installer::globals::separator . ${$idtfiles}[$i]; - my $onefile = installer::files::read_file($onefilename); - - for ( my $j = 0; $j <= $#{$onefile}; $j++ ) - { - ${$onefile}[$j] =~ s/WINDOWSENCODINGTEMPLATE/$encoding/g; - } - - installer::files::save_file($onefilename, $onefile); - } -} - -################################################################## # Setting the condition, that at least one module is selected. # All modules with flag SHOW_MULTILINGUAL_ONLY were already # collected. In table ControlE.idt, the string diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm index a95bed94517c..33e42ee5470a 100644 --- a/solenv/bin/modules/installer/windows/language.pm +++ b/solenv/bin/modules/installer/windows/language.pm @@ -47,27 +47,4 @@ sub get_windows_language return $windowslanguage; } -#################################################### -# Determining the Windows language ANSI-Codepage -# English: 1252 -#################################################### - -sub get_windows_encoding -{ - my ($language) = @_; - - my $windowsencoding = ""; - - if ( $installer::globals::msiencoding->{$language} ) { $windowsencoding = $installer::globals::msiencoding->{$language}; } - - if ( $windowsencoding eq "" ) { $windowsencoding = "0"; } # setting value, if the language is not listed in the encodinglist - - if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; } # languages with "0" have to be available in UTF-8 (65001) - - # Asian multilingual installation sets need a code neutral Windows Installer database -> $windowsencoding = 0 - if (( $language eq "en-US" ) && (( $installer::globals::product =~ /suitemulti/i ) || ( $installer::globals::product =~ /officemulti/i ) || ( $installer::globals::product =~ /c05office/i ) || ( $installer::globals::added_english ))) { $windowsencoding = "0"; } - - return $windowsencoding; -} - 1; diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index c7bbf550eaf0..0a898edfc34c 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -508,21 +508,6 @@ sub create_msi_database } } -##################################################################### -# Returning the value from sis.mlf for Summary Information Stream -##################################################################### - -sub get_value_from_sis_lng -{ - my ($language, $languagefile, $searchstring) = @_; - - my $language_block = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $languagefile); - my $newstring = installer::windows::idtglobal::get_language_string_from_language_block($language_block, $language, $searchstring); - $newstring = "\"" . $newstring . "\""; - - return $newstring; -} - ################################################################# # Returning the msi version for the Summary Information Stream ################################################################# @@ -544,24 +529,6 @@ sub get_wordcount_for_sis } ################################################################# -# Returning the codepage for the Summary Information Stream -################################################################# - -sub get_codepage_for_sis -{ - my ( $language ) = @_; - - my $codepage = installer::windows::language::get_windows_encoding($language); - - # Codepage 65001 does not work in Summary Information Stream - if ( $codepage == 65001 ) { $codepage = 0; } - - # my $codepage = "1252"; # determine dynamically in a function - # my $codepage = "65001"; # UTF-8 - return $codepage; -} - -################################################################# # Returning the template for the Summary Information Stream ################################################################# @@ -603,19 +570,6 @@ sub get_packagecode_for_sis } ################################################################# -# Returning the title for the Summary Information Stream -################################################################# - -sub get_title_for_sis -{ - my ( $language, $languagefile, $searchstring ) = @_; - - my $title = get_value_from_sis_lng($language, $languagefile, $searchstring ); - - return $title; -} - -################################################################# # Returning the author for the Summary Information Stream ################################################################# @@ -643,45 +597,6 @@ sub get_subject_for_sis return $subject; } -################################################################# -# Returning the comment for the Summary Information Stream -################################################################# - -sub get_comment_for_sis -{ - my ( $language, $languagefile, $searchstring ) = @_; - - my $comment = get_value_from_sis_lng($language, $languagefile, $searchstring ); - - return $comment; -} - -################################################################# -# Returning the keywords for the Summary Information Stream -################################################################# - -sub get_keywords_for_sis -{ - my ( $language, $languagefile, $searchstring ) = @_; - - my $keywords = get_value_from_sis_lng($language, $languagefile, $searchstring ); - - return $keywords; -} - -###################################################################### -# Returning the application name for the Summary Information Stream -###################################################################### - -sub get_appname_for_sis -{ - my ( $language, $languagefile, $searchstring ) = @_; - - my $appname = get_value_from_sis_lng($language, $languagefile, $searchstring ); - - return $appname; -} - ###################################################################### # Returning the security for the Summary Information Stream ###################################################################### @@ -713,19 +628,16 @@ sub write_summary_into_msi_database $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe"; } - my $sislanguage = "en-US"; # title, comment, keyword, and appname are always in English - my $msiversion = get_msiversion_for_sis(); - my $codepage = get_codepage_for_sis($language); + my $codepage = 0; # PID_CODEPAGE summary property in a signed short, therefore it is impossible to set 65001 here. my $template = get_template_for_sis($language, $allvariableshashref); my $guid = get_packagecode_for_sis(); - my $title = get_title_for_sis($sislanguage,$languagefile, "OOO_SIS_TITLE"); + my $title = "\"Installation database\""; my $author = get_author_for_sis(); my $subject = get_subject_for_sis($allvariableshashref); - my $comment = get_comment_for_sis($sislanguage,$languagefile, "OOO_SIS_COMMENT"); - $comment =~ s/\[ProductName\]/$allvariableshashref->{'PRODUCTNAME'}/; - my $keywords = get_keywords_for_sis($sislanguage,$languagefile, "OOO_SIS_KEYWORDS"); - my $appname = get_appname_for_sis($sislanguage,$languagefile, "OOO_SIS_APPNAME"); + my $comment = $allvariableshashref->{'PRODUCTNAME'}; + my $keywords = "\"Install,MSI\""; + my $appname = "\"Windows Installer\""; my $security = get_security_for_sis(); my $wordcount = get_wordcount_for_sis(); |