remove unused License Agreement dialog from MSI

5 files changed, 2 insertions, 34 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 194da515b9e3..249120bbbf79 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -292,18 +292,6 @@ en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
 [OOO_CONTROL_127]
 en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click Next."
 
-[OOO_CONTROL_128]
-en-US = "< &Back"
-
-[OOO_CONTROL_131]
-en-US = "Cancel"
-
-[OOO_CONTROL_132]
-en-US = "Please read the following license agreement carefully."
-
-[OOO_CONTROL_133]
-en-US = "{&MSSansBold8}License Agreement"
-
 [OOO_CONTROL_134]
 en-US = "&Next >"
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index f189c8ade1e4..7599ae5d189d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -190,18 +190,6 @@ InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127
 LanguageInfo1	Icon	Icon	15	15	24	24	5242881		CautionIco		
 LanguageInfo1	OK	PushButton	100	57	66	17	3		OOO_CONTROL_10		
 LanguageInfo1	Text	Text	48	15	194	30	3		OOO_CONTROL_317		
-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	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-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	90	234	284	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-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	297	0	77	44	1		BannerBmp		
 MaintenanceType	BannerLine	Line	0	44	374	0	1				
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 62a057e333ff..478b317e5244 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -18,8 +18,6 @@ FileTypeDialog	CheckBox3	Enable	&gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_I
 FileTypeDialog	CheckBox3	Disable	NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
 InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
 InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
 ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
 ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
 ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index fb788fdfbdc7..3eb1b8533ed8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -18,8 +18,7 @@ AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
 ApplicationInfo1	OK	EndDialog	Return	1	0
 CancelSetup	No	EndDialog	Return	1	0
 CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	1
-CustomerInformation	Back	NewDialog	InstallWelcome	HIDEEULA = 1	1
+CustomerInformation	Back	NewDialog	InstallWelcome	1	1
 CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
 CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
 CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
@@ -68,12 +67,8 @@ InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
 InstallChangeFolder	Up	DirectoryListUp	0	1	0
 InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
 InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	CustomerInformation	HIDEEULA = 1	0
+InstallWelcome	Next	NewDialog	CustomerInformation	1	0
 LanguageInfo1	OK	EndDialog	Return	1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	CustomerInformation	AgreeToLicense = "Yes"	0
 MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
 MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
 MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index d202b7c4b289..6b7d05ba7b63 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -17,7 +17,6 @@ FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBo
 InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
 InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 LanguageInfo1	50	50	260	85	3	[ProductName]  - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
 MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
 MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
 OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume