Kaydet (Commit) 674db242 authored tarafından Andras Timar's avatar Andras Timar

fdo#80332 remove "Support assistive technology tools" checkbox from installer

Revert "fdo#39833 add "Support assistive technology tools" option to Windows installer"

This reverts commit 98fd8f34.

Conflicts:

	instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
	instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
	instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt

Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42
üst 11386658
...@@ -682,8 +682,5 @@ en-US = "No applications have been selected for installation. Click OK, then sel ...@@ -682,8 +682,5 @@ en-US = "No applications have been selected for installation. Click OK, then sel
[OOO_CONTROL_319] [OOO_CONTROL_319]
en-US = "Create a start link on desktop" en-US = "Create a start link on desktop"
[OOO_CONTROL_320]
en-US = "Support assistive technology tools"
[OOO_CONTROL_321] [OOO_CONTROL_321]
en-US = "Load [ProductName] during system start-up" en-US = "Load [ProductName] during system start-up"
...@@ -2,5 +2,4 @@ Property Value ...@@ -2,5 +2,4 @@ Property Value
s72 S64 s72 S64
CheckBox Property CheckBox Property
CREATEDESKTOPLINK 1 CREATEDESKTOPLINK 1
ENABLEATTOOLS 1
QUICKSTART 1 QUICKSTART 1
...@@ -195,7 +195,7 @@ PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162 ...@@ -195,7 +195,7 @@ PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToInstall BannerLine Line 0 44 374 0 1 ReadyToInstall BannerLine Line 0 44 374 0 1
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 DesktopLink ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167 ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
ReadyToInstall DlgLine Line 0 234 374 0 1 ReadyToInstall DlgLine Line 0 234 374 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168 ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
...@@ -205,8 +205,7 @@ ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171 ...@@ -205,8 +205,7 @@ ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172 ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableATTools ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableATTools
ReadyToInstall EnableATTools CheckBox 21 125 300 10 3 ENABLEATTOOLS OOO_CONTROL_320 EnableQuickstart ReadyToInstall EnableQuickstart CheckBox 21 125 300 10 3 QUICKSTART OOO_CONTROL_321 Back
ReadyToInstall EnableQuickstart CheckBox 21 150 300 10 3 QUICKSTART OOO_CONTROL_321 Back
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
ReadyToRemove BannerLine Line 0 44 374 0 1 ReadyToRemove BannerLine Line 0 44 374 0 1
......
...@@ -665,41 +665,3 @@ RegistryItem gid_Regitem_Software_RegisteredApplications ...@@ -665,41 +665,3 @@ RegistryItem gid_Regitem_Software_RegisteredApplications
Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities"; Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities";
Styles = (); Styles = ();
End End
Module gid_Module_Enable_AT_Tools_For_All_Users
ParentID = gid_Module_Root;
Name = "gid_Module_Enable_AT_Tools_For_All_Users";
Description = "gid_Module_Enable_AT_Tools_For_All_Users";
Styles = (HIDDEN_ROOT);
Minimal = YES;
Default = YES;
End
Module gid_Module_Enable_AT_Tools_For_Current_User
ParentID = gid_Module_Root;
Name = "gid_Module_Enable_AT_Tools_For_Current_User";
Description = "gid_Module_Enable_AT_Tools_For_Current_User";
Styles = (HIDDEN_ROOT);
Minimal = YES;
Default = YES;
End
RegistryItem gid_Regitem_Enable_AT_Tools_For_All_Users
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
Subkey = "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";
ModuleID = gid_Module_Enable_AT_Tools_For_All_Users;
Name = "SAL_ACCESSIBILITY_ENABLED";
Value = "1";
Styles = ();
ComponentCondition = "(ALLUSERS=1) AND (ENABLEATTOOLS=1)";
End
RegistryItem gid_Regitem_Enable_AT_Tools_For_Current_User
ParentID = PREDEFINED_HKEY_CURRENT_USER;
Subkey = "Environment";
ModuleID = gid_Module_Enable_AT_Tools_For_Current_User;
Name = "SAL_ACCESSIBILITY_ENABLED";
Value = "1";
Styles = ();
ComponentCondition = "(ALLUSERS<>1) AND (ENABLEATTOOLS=1)";
End
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment