instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 3
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 5 -
scp2/source/ooo/registryitem_ooo.scp | 38
----------
4 files changed, 2 insertions(+), 45 deletions(-)
New commits:
commit 674db242c037020626050c8de06367808d94eaaa
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jun 22 11:00:07 2014 +0200
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 98fd8f345504e98e9ed16f4845d55f5b88b77a5e.
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
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f2b6917..f4293a5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -682,8 +682,5 @@ en-US = "No applications have been selected for
installation. Click OK, then sel
[OOO_CONTROL_319]
en-US = "Create a start link on desktop"
-[OOO_CONTROL_320]
-en-US = "Support assistive technology tools"
-
[OOO_CONTROL_321]
en-US = "Load [ProductName] during system start-up"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index 85d191a..08463f4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -2,5 +2,4 @@ Property Value
s72 S64
CheckBox Property
CREATEDESKTOPLINK 1
-ENABLEATTOOLS 1
QUICKSTART 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index a9fc6d2..64ab818 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -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 Banner Bitmap 0 0 374 44 1
BannerBmp
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 DlgLine Line 0 234 374 0 1
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
ReadyToInstall DlgTitle3 Text 13 6 280 25 65538
OOO_CONTROL_172
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 EnableATTools CheckBox 21 125 300 10
3 ENABLEATTOOLS OOO_CONTROL_320 EnableQuickstart
-ReadyToInstall EnableQuickstart CheckBox 21 150 300
10 3 QUICKSTART OOO_CONTROL_321 Back
+ReadyToInstall EnableQuickstart CheckBox 21 125 300
10 3 QUICKSTART OOO_CONTROL_321 Back
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
diff --git a/scp2/source/ooo/registryitem_ooo.scp
b/scp2/source/ooo/registryitem_ooo.scp
index f5110ac..1c324d5 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -665,41 +665,3 @@ RegistryItem gid_Regitem_Software_RegisteredApplications
Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities";
Styles = ();
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
