INTEGRATION: CWS nativefixer3 (1.4.30); FILE MERGED

2005/01/21 11:32:04 is 1.4.30.3: #i37373# using standard icons
2004/12/17 16:38:34 is 1.4.30.2: #i38842# adapting length of line for filetypedialog
2004/12/16 13:47:41 is 1.4.30.1: #115972# length of dialog line

1 files changed, 20 insertions, 24 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 469d95742b61..31e1ea910e90 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -9,7 +9,7 @@ AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText
 AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
 AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
 AdminChangeFolder	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	90	234	326	0	1				
+AdminChangeFolder	DlgLine	Line	90	234	284	0	1				
 AdminChangeFolder	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_7		
 AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
 AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
@@ -25,7 +25,7 @@ AdminNetworkLocation	Branding2	Text	3	228	88	13	65537		[ProductName]
 AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
 AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	SetupPathEdit	
 AdminNetworkLocation	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	90	234	326	0	1				
+AdminNetworkLocation	DlgLine	Line	90	234	284	0	1				
 AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
 AdminNetworkLocation	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_21		
 AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
@@ -51,7 +51,7 @@ CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel
 CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
 CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
 CustomerInformation	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	90	234	326	0	1				
+CustomerInformation	DlgLine	Line	90	234	284	0	1				
 CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
 CustomerInformation	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_40		
 CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
@@ -69,7 +69,7 @@ CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree
 CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
 CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
 CustomSetup	DlgDesc	Text	17	23	292	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	90	234	326	0	1				
+CustomSetup	DlgLine	Line	90	234	284	0	1				
 CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
 CustomSetup	DlgTitle	Text	9	6	292	25	65539		OOO_CONTROL_54		
 CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
@@ -85,20 +85,16 @@ CustomSetupTips	BannerLine	Line	0	44	374	0	1
 CustomSetupTips	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetupTips	Branding2	Text	3	228	88	13	65537		[ProductName]		
 CustomSetupTips	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	90	234	326	0	1				
+CustomSetupTips	DlgLine	Line	90	234	284	0	1				
 CustomSetupTips	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_65		
 CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
 CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	FirstInstallText	Text	60	180	300	20	3		OOO_CONTROL_67		
 CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallFirstUse	Icon	21	180	24	24	5242881		InstallFirstUseIco		
 CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
 CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
 CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
 CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
 CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	NetworkInstall	Icon	21	205	24	24	5242881		NetworkInstallIco		
-CustomSetupTips	NetworkInstallText	Text	60	205	300	20	3		OOO_CONTROL_71		
 CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
 CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
 DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
@@ -110,7 +106,7 @@ DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder
 DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
 DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
 DatabaseFolder	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	90	234	326	0	1				
+DatabaseFolder	DlgLine	Line	90	234	284	0	1				
 DatabaseFolder	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_80		
 DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
 DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
@@ -124,7 +120,7 @@ DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder
 DestinationFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_88	Back	
 DestinationFolder	DestFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
 DestinationFolder	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_89		
-DestinationFolder	DlgLine	Line	90	234	326	0	1				
+DestinationFolder	DlgLine	Line	90	234	284	0	1				
 DestinationFolder	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_90		
 DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_91		
 DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
@@ -134,7 +130,7 @@ DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1
 DiskSpaceRequirements	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 DiskSpaceRequirements	Branding2	Text	3	228	88	13	65537		[ProductName]		
 DiskSpaceRequirements	DlgDesc	Text	17	23	292	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	90	234	326	0	1				
+DiskSpaceRequirements	DlgLine	Line	90	234	284	0	1				
 DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
 DiskSpaceRequirements	DlgTitle	Text	9	6	292	25	65539		OOO_CONTROL_98		
 DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
@@ -144,7 +140,7 @@ FilesInUse	BannerLine	Line	0	44	374	0	1
 FilesInUse	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 FilesInUse	Branding2	Text	3	228	88	13	65537		[ProductName]		
 FilesInUse	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	90	234	326	0	1				
+FilesInUse	DlgLine	Line	90	234	284	0	1				
 FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
 FilesInUse	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_105		
 FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
@@ -161,7 +157,7 @@ FileTypeDialog	CheckBox1	CheckBox	41	86	200	10	3	SELECT_WORD	 OOO_CONTROL_270	Ch
 FileTypeDialog	CheckBox2	CheckBox	41	111	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
 FileTypeDialog	CheckBox3	CheckBox	41	136	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
 FileTypeDialog	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	48	234	326	0	1				
+FileTypeDialog	DlgLine	Line	90	234	284	0	1				
 FileTypeDialog	DlgText	Text	21	56	326	10	3		 OOO_CONTROL_275		
 FileTypeDialog	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_278		
 FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
@@ -173,7 +169,7 @@ InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText
 InstallChangeFolder	Combo	DirectoryCombo	21	64	277	80	4128779	_BrowseProperty		Up	
 InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
 InstallChangeFolder	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	90	234	326	0	1				
+InstallChangeFolder	DlgLine	Line	90	234	284	0	1				
 InstallChangeFolder	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_115		
 InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
 InstallChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
@@ -196,7 +192,7 @@ LanguageSelection	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]
 LanguageSelection	Branding2	Text	3	228	88	13	65537		[ProductName]		
 LanguageSelection	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Back	
 LanguageSelection	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_267		
-LanguageSelection	DlgLine	Line	90	234	326	0	1				
+LanguageSelection	DlgLine	Line	90	234	284	0	1				
 LanguageSelection	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_268		
 LanguageSelection	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
 LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
@@ -207,7 +203,7 @@ 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	292	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	90	234	326	0	1				
+LicenseAgreement	DlgLine	Line	90	234	284	0	1				
 LicenseAgreement	DlgTitle	Text	13	6	292	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	
@@ -218,7 +214,7 @@ MaintenanceType	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]
 MaintenanceType	Branding2	Text	3	228	88	13	65537		[ProductName]		
 MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
 MaintenanceType	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	90	234	326	0	1				
+MaintenanceType	DlgLine	Line	90	234	284	0	1				
 MaintenanceType	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_140		
 MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupPartialIco		
 MaintenanceType	Ico2	Icon	35	135	24	24	5242881		SetupRepairIco		
@@ -240,7 +236,7 @@ OutOfSpace	BannerLine	Line	0	44	374	0	1
 OutOfSpace	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 OutOfSpace	Branding2	Text	3	228	88	13	65537		[ProductName]		
 OutOfSpace	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	90	234	326	0	1				
+OutOfSpace	DlgLine	Line	90	234	284	0	1				
 OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
 OutOfSpace	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_155		
 OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
@@ -259,7 +255,7 @@ ReadyToInstall	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]
 ReadyToInstall	Branding2	Text	3	228	88	13	65537		[ProductName]		
 ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
 ReadyToInstall	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	90	234	374	0	1				
+ReadyToInstall	DlgLine	Line	90	234	284	0	1				
 ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
 ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
 ReadyToInstall	DlgTitle	Text	13	6	292	25	65538		OOO_CONTROL_170		
@@ -273,7 +269,7 @@ ReadyToRemove	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]
 ReadyToRemove	Branding2	Text	3	228	88	13	65537		[ProductName]		
 ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
 ReadyToRemove	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	90	234	326	0	1				
+ReadyToRemove	DlgLine	Line	90	234	284	0	1				
 ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
 ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
 ReadyToRemove	DlgText2	Text	21	102	330	24	3				
@@ -346,7 +342,7 @@ SetupProgress	Branding2	Text	3	228	88	13	65537		[ProductName]
 SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
 SetupProgress	DlgDesc	Text	21	23	292	25	65538		OOO_CONTROL_234		
 SetupProgress	DlgDesc2	Text	21	23	292	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	90	234	326	0	1				
+SetupProgress	DlgLine	Line	90	234	284	0	1				
 SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
 SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
 SetupProgress	DlgTitle	Text	13	6	292	25	65538		OOO_CONTROL_238		
@@ -376,7 +372,7 @@ SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255
 SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
 SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
 SetupType	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	90	234	326	0	1				
+SetupType	DlgLine	Line	90	234	284	0	1				
 SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
 SetupType	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_259		
 SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
@@ -385,6 +381,6 @@ SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next
 SplashBitmap	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 SplashBitmap	Branding2	Text	3	228	88	13	65537		[ProductName]		
 SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	90	234	374	0	1				
+SplashBitmap	DlgLine	Line	90	234	284	0	1				
 SplashBitmap	Image	Bitmap	13	12	349	211	1		ImageBmp		
 SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel