remove unused License Agreement dialog from MSI

26 files changed, 14 insertions, 240 deletions

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 92b51309a456..e9a774291d19 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -189,18 +189,6 @@ InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp
 InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
 InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
 InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-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	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-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	145	234	229	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_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index f3a286b3e39d..9adacf8e837e 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
 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_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index 21f7fe7726a5..b03c291ce03f 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
 AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
 CancelSetup	No	EndDialog	Return	1	0
 CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	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
@@ -38,8 +38,7 @@ DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
 DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
 DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
+DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
 DestinationFolder	ChangeFolder	NewDialog	InstallChangeFolder	1	1
@@ -59,11 +58,7 @@ 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	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
+InstallWelcome	Next	NewDialog	DestinationFolder	1	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_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
index 100074c408bf..d950c9af1ce9 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retr
 FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
 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
-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
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 92b51309a456..e9a774291d19 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -189,18 +189,6 @@ InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp
 InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
 InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
 InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-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	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-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	145	234	229	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_ooolangpack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
index f3a286b3e39d..9adacf8e837e 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
 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_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index 21f7fe7726a5..b03c291ce03f 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
 AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
 CancelSetup	No	EndDialog	Return	1	0
 CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	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
@@ -38,8 +38,7 @@ DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
 DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
 DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
+DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
 DestinationFolder	ChangeFolder	NewDialog	InstallChangeFolder	1	1
@@ -59,11 +58,7 @@ 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	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
+InstallWelcome	Next	NewDialog	DestinationFolder	1	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_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
index 100074c408bf..d950c9af1ce9 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retr
 FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
 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
-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
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
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index 9d892abb7244..2ec0a3713a07 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -184,18 +184,6 @@ InstallWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp
 InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
 InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
 InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-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	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	92	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	95	234	279	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_sdkoo/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
index f3a286b3e39d..9adacf8e837e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
 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_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 49407d4770da..05254de76b77 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
 AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
 CancelSetup	No	EndDialog	Return	1	0
 CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	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
@@ -38,8 +38,7 @@ DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
 DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
 DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
+DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
 DestinationFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
@@ -60,11 +59,7 @@ 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	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
+InstallWelcome	Next	NewDialog	DestinationFolder	1	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_sdkoo/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
index 54a594fd9e32..b3e2cdb095ee 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retr
 FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
 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
-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
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
index 7fa9fbc9b955..71f84a87a856 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
@@ -184,18 +184,6 @@ InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp
 InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
 InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
 InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-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	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	32	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	35	234	339	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_ure/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
index f3a286b3e39d..9adacf8e837e 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
@@ -12,8 +12,6 @@ CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
 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_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 49407d4770da..05254de76b77 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -17,7 +17,7 @@ AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
 AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
 CancelSetup	No	EndDialog	Return	1	0
 CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	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
@@ -38,8 +38,7 @@ DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
 DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
 DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
+DestinationFolder	Back	NewDialog	InstallWelcome	1	0
 DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
 DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
 DestinationFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
@@ -60,11 +59,7 @@ 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	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
+InstallWelcome	Next	NewDialog	DestinationFolder	1	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_ure/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
index 54a594fd9e32..b3e2cdb095ee 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
@@ -15,7 +15,6 @@ FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retr
 FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
 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
-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
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 086ab9f12413..edd7f93d9e5f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -13,7 +13,6 @@ Globals
             SERVICETAG_PARENTNAME LibreOffice 3.6
             SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
             SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
-            HIDELICENSEDIALOG 1
             PACKAGEPREFIX
             BASISPACKAGEPREFIX libobasis
             UREPACKAGEPREFIX libreoffice
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 18cd74eff034..7d0f56ad29ef 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1720,22 +1720,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE)
             installer::windows::idtglobal::set_multilanguageonly_condition($languageidtdir);
 
-            # include the license text into the table Control.idt
-
-            if ( ! $allvariableshashref->{'HIDELICENSEDIALOG'} )
-            {
-                my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
-                my $licensefile = installer::files::read_file($licensefilesource);
-                installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
-                my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
-                my $controltable = installer::files::read_file($controltablename);
-                installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
-                installer::files::save_file($controltablename, $controltable);
-
-                $infoline = "Added licensefile $licensefilesource into database $controltablename\n";
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-
             # include a component into environment table if required
 
             installer::windows::component::set_component_in_environment_table($languageidtdir, $filesinproductlanguageresolvedarrayref);
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 5f477a5c8924..29a98b0c1820 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -408,11 +408,6 @@ sub create_package
         my $sla = 'sla.r';
         my $ref = "";
 
-        if ( ! $allvariables->{'HIDELICENSEDIALOG'} )
-        {
-            installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0);
-        }
-
         my $localtempdir = $tempdir;
 
         if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 176e8352e7f1..cb5fa18fb4c5 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1037,75 +1037,6 @@ sub add_officedir_to_database
 
 }
 
-##############################################################
-# Including the license text into the table control.idt
-##############################################################
-
-sub add_licensefile_to_database
-{
-    my ($licensefile, $controltable) = @_;
-
-    # Nine tabs before the license text and two tabs after it
-    # The license text has to be included into the dialog
-    # LicenseAgreement into the control Memo.
-
-    my $foundlicenseline = 0;
-    my ($number, $line);
-
-    for ( my $i = 0; $i <= $#{$controltable}; $i++ )
-    {
-        $line = ${$controltable}[$i];
-
-        if ( $line =~ /^\s*\bLicenseAgreement\b\t\bMemo\t/ )
-        {
-            $foundlicenseline = 1;
-            $number = $i;
-            last;
-        }
-    }
-
-    if (!($foundlicenseline))
-    {
-        installer::exiter::exit_program("ERROR: Line for license file in Control.idt not found!", "add_licensefile_to_database");
-    }
-    else
-    {
-        my %control = ();
-
-        if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $control{'Dialog_'} = $1;
-            $control{'Control'} = $2;
-            $control{'Type'} = $3;
-            $control{'X'} = $4;
-            $control{'Y'} = $5;
-            $control{'Width'} = $6;
-            $control{'Height'} = $7;
-            $control{'Attributes'} = $8;
-            $control{'Property'} = $9;
-            $control{'Text'} = $10;
-            $control{'Control_Next'} = $11;
-            $control{'Help'} = $12;
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Could not split line correctly!", "add_licensefile_to_database");
-        }
-
-        # my $licensetext = get_rtf_licensetext($licensefile);
-        my $licensetext = make_string_licensetext($licensefile);
-
-        $control{'Text'} = $licensetext;
-
-        my $newline = $control{'Dialog_'} . "\t" . $control{'Control'} . "\t" . $control{'Type'} . "\t" .
-                        $control{'X'} . "\t" . $control{'Y'} . "\t" . $control{'Width'} . "\t" .
-                        $control{'Height'} . "\t" . $control{'Attributes'} . "\t" . $control{'Property'} . "\t" .
-                        $control{'Text'} . "\t" . $control{'Control_Next'} . "\t" . $control{'Help'} . "\n";
-
-        ${$controltable}[$number] = $newline
-    }
-}
-
 ###################################################################
 # Determining the last position in a sequencetable
 # into the tables CustomAc.idt and InstallE.idt.
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 6319276954b9..27b19d7170c5 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -390,29 +390,6 @@ sub set_important_properties
         push(@{$propertyfile}, $onepropertyline);
     }
 
-    # No more license dialog for selected products
-    if ( $allvariables->{'HIDELICENSEDIALOG'} )
-    {
-        my $onepropertyline = "HIDEEULA" . "\t" . "1" . "\n";
-
-        my $already_defined = 0;
-
-        for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
-        {
-            if ( ${$propertyfile}[$i] =~ /^\s*HIDEEULA\t/ )
-            {
-                ${$propertyfile}[$i] = $onepropertyline;
-                $already_defined = 1;
-                last;
-            }
-        }
-
-        if ( ! $already_defined )
-        {
-            push(@{$propertyfile}, $onepropertyline);
-        }
-    }
-
     # Setting .NET requirements
     if ( $installer::globals::required_dotnet_version ne "" )
     {