openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1842939 - in /openoffice/branches/AOO416/main: instsetoo_native/inc_ooolangpack/windows/msi_templates/ instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/ instsetoo_native/inc_openoffice/windows/msi_templates/ instsetoo_native/i...
Date Fri, 05 Oct 2018 16:08:38 GMT
Author: mseidel
Date: Fri Oct  5 16:08:38 2018
New Revision: 1842939

URL: http://svn.apache.org/viewvc?rev=1842939&view=rev
Log:
i116363 - Don't stretch logo in Installation Wizard

Additionally we now have the new ASF logo throughout the Windows installation.

Modified:
    openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
    openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
    openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
    openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
    openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobanner.bmp
    openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobitmap.bmp
    openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbanner.bmp
    openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt (original)
+++ openoffice/branches/AOO416/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt Fri Oct  5 16:08:38 2018
@@ -1,7 +1,7 @@
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
 s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
 WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
 AdminChangeFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminChangeFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -18,7 +18,7 @@ AdminChangeFolder	Tail	PathEdit	21	207	3
 AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
 AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
 AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
 AdminNetworkLocation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminNetworkLocation	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -34,7 +34,7 @@ AdminNetworkLocation	SetupPathEdit	PathE
 AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
 AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
 AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+AdminWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
 AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
 AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
@@ -43,7 +43,7 @@ CancelSetup	No	PushButton	135	57	66	17	3
 CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
 CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
 CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomerInformation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomerInformation	BannerLine	Line	0	44	374	0	1				
 CustomerInformation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomerInformation	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -61,7 +61,7 @@ CustomerInformation	RadioGroup	RadioButt
 CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
 CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
 CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetup	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomSetup	BannerLine	Line	0	44	374	0	1				
 CustomSetup	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetup	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -80,7 +80,7 @@ CustomSetup	Location	Text	8	203	291	20	3
 CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
 CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
 CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetupTips	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomSetupTips	BannerLine	Line	0	44	374	0	1				
 CustomSetupTips	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetupTips	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -98,7 +98,7 @@ CustomSetupTips	MenuText	Text	50	52	300
 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	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DatabaseFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DatabaseFolder	BannerLine	Line	0	44	374	0	1				
 DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -112,7 +112,7 @@ DatabaseFolder	Location	Text	57	65	240	4
 DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
 DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DestinationFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
 DestinationFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
 DestinationFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
@@ -131,7 +131,7 @@ DestinationFolder	LabelWrongProduct	Text
 DestinationFolder	LabelStartInstall2	Text	21	82	290	30	2		OOO_CONTROL_305		
 DestinationFolder	LabelInvalidDir2	Text	21	82	290	30	2		OOO_CONTROL_307		
 DestinationFolder	LabelWrongProduct2	Text	21	82	290	30	2		OOO_CONTROL_306		
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
 DiskSpaceRequirements	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 DiskSpaceRequirements	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -141,7 +141,7 @@ DiskSpaceRequirements	DlgText	Text	10	18
 DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
 DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
 DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FilesInUse	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 FilesInUse	BannerLine	Line	0	44	374	0	1				
 FilesInUse	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 FilesInUse	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -154,7 +154,7 @@ FilesInUse	Ignore	PushButton	230	243	66
 FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
 FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
 FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FileTypeDialog	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 FileTypeDialog	BannerLine	Line	0	44	374	0	1				
 FileTypeDialog	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 FileTypeDialog	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -168,7 +168,7 @@ FileTypeDialog	DlgText	Text	21	56	326	40
 FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
 FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
 FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+InstallChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
 InstallChangeFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
 InstallChangeFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
@@ -187,13 +187,13 @@ InstallWelcome	Back	PushButton	164	243	6
 InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
 InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
 InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+InstallWelcome	Image	Bitmap	0	0	122	234	1048577		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	Banner	Bitmap	297	0	77	44	1048577		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]		
@@ -204,7 +204,7 @@ LicenseAgreement	DlgTitle	Text	13	6	280
 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	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 MaintenanceType	BannerLine	Line	0	44	374	0	1				
 MaintenanceType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 MaintenanceType	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -221,11 +221,11 @@ MaintenanceType	Text2	Text	80	135	260	35
 MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
 MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
 MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+MaintenanceWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
 MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
 MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+OutOfSpace	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 OutOfSpace	BannerLine	Line	0	44	374	0	1				
 OutOfSpace	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 OutOfSpace	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -238,12 +238,12 @@ OutOfSpace	Resume	PushButton	301	243	66
 PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
 PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
 PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+PatchWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
 PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
 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	297	0	77	44	1		BannerBmp		
+ReadyToInstall	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToInstall	BannerLine	Line	0	44	374	0	1				
 ReadyToInstall	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToInstall	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -257,7 +257,7 @@ ReadyToInstall	DlgTitle2	Text	13	6	280	2
 ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
 ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
 ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+ReadyToRemove	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToRemove	BannerLine	Line	0	44	374	0	1				
 ReadyToRemove	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToRemove	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -275,7 +275,7 @@ SetupCompleteError	DlgLine	Line	0	234	37
 SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
 SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
 SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupCompleteError	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
 SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
 SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
@@ -287,7 +287,7 @@ SetupCompleteSuccess	CheckForUpdatesText
 SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
 SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
 SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
+SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1048577		ImageBmp	CheckBoxUpdates	
 SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
 SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
 SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
@@ -311,7 +311,7 @@ SetupInitialization	ActionText	Text	135
 SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
 SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
 SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInitialization	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
 SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
 SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
@@ -321,7 +321,7 @@ SetupInterrupted	DlgLine	Line	0	234	374
 SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
 SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
 SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInterrupted	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
 SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
 SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
@@ -329,7 +329,7 @@ SetupInterrupted	TextLine2	Text	135	55	2
 SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
 SetupProgress	ActionText	Text	59	100	275	12	3				
 SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupProgress	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupProgress	BannerLine	Line	0	44	374	0	1				
 SetupProgress	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupProgress	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -350,13 +350,13 @@ SetupProgress	TextTime	Text	59	139	96	12
 SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
 SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
 SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupResume	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
 SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
 SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
 SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
 SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupType	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupType	BannerLine	Line	0	44	374	0	1				
 SetupType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupType	Branding2	Text	3	228	140	13	65537		[ProductName]		
@@ -376,5 +376,5 @@ SplashBitmap	Branding1	Text	4	229	140	13
 SplashBitmap	Branding2	Text	3	228	140	13	65537		[ProductName]		
 SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
 SplashBitmap	DlgLine	Line	145	234	229	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
+SplashBitmap	Image	Bitmap	13	12	114	211	1048577		ImageBmp		
 SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt (original)
+++ openoffice/branches/AOO416/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt Fri Oct  5 16:08:38 2018
@@ -1,7 +1,7 @@
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
 s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
 WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
 AdminChangeFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminChangeFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -18,7 +18,7 @@ AdminChangeFolder	Tail	PathEdit	21	207	3
 AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
 AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
 AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
 AdminNetworkLocation	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminNetworkLocation	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -34,7 +34,7 @@ AdminNetworkLocation	SetupPathEdit	PathE
 AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
 AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
 AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+AdminWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
 AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
 AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
@@ -46,7 +46,7 @@ CancelSetup	No	PushButton	135	57	66	17	3
 CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
 CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
 CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomerInformation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomerInformation	BannerLine	Line	0	44	374	0	1				
 CustomerInformation	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomerInformation	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -64,7 +64,7 @@ CustomerInformation	RadioGroup	RadioButt
 CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
 CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
 CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetup	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomSetup	BannerLine	Line	0	44	374	0	1				
 CustomSetup	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetup	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -83,7 +83,7 @@ CustomSetup	Location	Text	8	203	291	20	3
 CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
 CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
 CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetupTips	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 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]		
@@ -101,7 +101,7 @@ CustomSetupTips	MenuText	Text	50	52	300
 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	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DatabaseFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DatabaseFolder	BannerLine	Line	0	44	374	0	1				
 DatabaseFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 DatabaseFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -115,7 +115,7 @@ DatabaseFolder	Location	Text	57	65	240	4
 DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
 DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DestinationFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
 DestinationFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 DestinationFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -128,7 +128,7 @@ DestinationFolder	DlgTitle	Text	13	6	280
 DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_91		
 DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
 DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 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]		
@@ -138,7 +138,7 @@ DiskSpaceRequirements	DlgText	Text	10	18
 DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
 DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
 DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FilesInUse	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 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]		
@@ -151,7 +151,7 @@ FilesInUse	Ignore	PushButton	230	243	66
 FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
 FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
 FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FileTypeDialog	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 FileTypeDialog	BannerLine	Line	0	44	374	0	1				
 FileTypeDialog	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 FileTypeDialog	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -165,7 +165,7 @@ FileTypeDialog	DlgText	Text	21	56	326	40
 FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
 FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
 FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+InstallChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
 InstallChangeFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 InstallChangeFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -185,7 +185,7 @@ InstallWelcome	Back	PushButton	164	243	6
 InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
 InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
 InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+InstallWelcome	Image	Bitmap	0	0	122	234	1048577		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		
@@ -193,7 +193,7 @@ LanguageInfo1	Icon	Icon	15	15	24	24	5242
 LanguageInfo1	OK	PushButton	100	57	66	17	3		OOO_CONTROL_10		
 LanguageInfo1	Text	Text	48	15	194	30	3		OOO_CONTROL_317		
 LanguageSelection	Back	PushButton	164	243	66	17	3		OOO_CONTROL_122	CheckBox1	
-LanguageSelection	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+LanguageSelection	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 LanguageSelection	BannerLine	Line	0	44	374	0	1				
 LanguageSelection	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 LanguageSelection	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -204,7 +204,7 @@ LanguageSelection	DlgTitle	Text	13	6	292
 LanguageSelection	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
 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	Banner	Bitmap	297	0	77	44	1048577		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]		
@@ -215,7 +215,7 @@ LicenseAgreement	DlgTitle	Text	13	6	280
 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	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 MaintenanceType	BannerLine	Line	0	44	374	0	1				
 MaintenanceType	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 MaintenanceType	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -234,11 +234,11 @@ MaintenanceType	Text3	Text	80	192	260	35
 MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
 MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
 MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+MaintenanceWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
 MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
 MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+OutOfSpace	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 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]		
@@ -251,12 +251,12 @@ OutOfSpace	Resume	PushButton	301	243	66
 PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
 PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
 PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
+PatchWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
 PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
 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	297	0	77	44	1		BannerBmp		
+ReadyToInstall	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToInstall	BannerLine	Line	0	44	374	0	1				
 ReadyToInstall	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToInstall	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -272,7 +272,7 @@ ReadyToInstall	InstallNow	PushButton	230
 ReadyToInstall	DesktopLink	CheckBox	21	100	300	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319		
 ReadyToInstall	UpdateCheckBox	CheckBox	21	120	200	10	3	REMOVEOLDPRODUCTS	OOO_CONTROL_320		
 ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+ReadyToRemove	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToRemove	BannerLine	Line	0	44	374	0	1				
 ReadyToRemove	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToRemove	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -290,7 +290,7 @@ SetupCompleteError	DlgLine	Line	0	234	37
 SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
 SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
 SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupCompleteError	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
 SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
 SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
@@ -302,7 +302,7 @@ SetupCompleteSuccess	CheckForUpdatesText
 SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
 SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
 SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
+SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1048577		ImageBmp	CheckBoxUpdates	
 SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
 SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
 SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
@@ -326,7 +326,7 @@ SetupInitialization	ActionText	Text	135
 SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
 SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
 SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInitialization	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
 SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
 SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
@@ -336,7 +336,7 @@ SetupInterrupted	DlgLine	Line	0	234	374
 SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
 SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
 SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupInterrupted	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
 SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
 SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
@@ -344,7 +344,7 @@ SetupInterrupted	TextLine2	Text	135	55	2
 SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
 SetupProgress	ActionText	Text	59	100	275	12	3				
 SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupProgress	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupProgress	BannerLine	Line	0	44	374	0	1				
 SetupProgress	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupProgress	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -365,13 +365,13 @@ SetupProgress	TextTime	Text	59	139	96	12
 SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
 SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
 SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
+SetupResume	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
 SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
 SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
 SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
 SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupType	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupType	BannerLine	Line	0	44	374	0	1				
 SetupType	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupType	Branding2	Text	3	228	88	13	65537		[ProductName]		
@@ -391,5 +391,5 @@ SplashBitmap	Branding1	Text	4	229	88	13
 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	284	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
+SplashBitmap	Image	Bitmap	13	12	114	211	1048577		ImageBmp		
 SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt (original)
+++ openoffice/branches/AOO416/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt Fri Oct  5 16:08:38 2018
@@ -1,7 +1,7 @@
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
 s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
 WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
 AdminChangeFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminChangeFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -18,7 +18,7 @@ AdminChangeFolder	Tail	PathEdit	21	207	3
 AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
 AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
 AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
 AdminNetworkLocation	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 AdminNetworkLocation	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -34,7 +34,7 @@ AdminNetworkLocation	SetupPathEdit	PathE
 AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
 AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
 AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
+AdminWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
 AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
 AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
@@ -43,7 +43,7 @@ CancelSetup	No	PushButton	135	57	66	17	3
 CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
 CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
 CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomerInformation	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomerInformation	BannerLine	Line	0	44	374	0	1				
 CustomerInformation	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomerInformation	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -61,7 +61,7 @@ CustomerInformation	RadioGroup	RadioButt
 CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
 CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
 CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetup	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomSetup	BannerLine	Line	0	44	374	0	1				
 CustomSetup	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetup	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -80,7 +80,7 @@ CustomSetup	Location	Text	8	203	291	20	3
 CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
 CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
 CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+CustomSetupTips	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 CustomSetupTips	BannerLine	Line	0	44	374	0	1				
 CustomSetupTips	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 CustomSetupTips	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -98,7 +98,7 @@ CustomSetupTips	MenuText	Text	50	52	300
 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	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DatabaseFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DatabaseFolder	BannerLine	Line	0	44	374	0	1				
 DatabaseFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 DatabaseFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -112,7 +112,7 @@ DatabaseFolder	Location	Text	57	65	240	4
 DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
 DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
 DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DestinationFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DestinationFolder	BannerLine	Line	0	44	374	0	1				
 DestinationFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 DestinationFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -125,7 +125,7 @@ DestinationFolder	DlgTitle	Text	13	6	280
 DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
 DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
 DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
 DiskSpaceRequirements	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 DiskSpaceRequirements	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -135,7 +135,7 @@ DiskSpaceRequirements	DlgText	Text	10	18
 DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
 DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
 DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FilesInUse	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 FilesInUse	BannerLine	Line	0	44	374	0	1				
 FilesInUse	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 FilesInUse	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -148,7 +148,7 @@ FilesInUse	Ignore	PushButton	230	243	66
 FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
 FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
 FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+FileTypeDialog	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 FileTypeDialog	BannerLine	Line	0	44	374	0	1				
 FileTypeDialog	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 FileTypeDialog	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -162,7 +162,7 @@ FileTypeDialog	DlgText	Text	21	56	326	40
 FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
 FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
 FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+InstallChangeFolder	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
 InstallChangeFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 InstallChangeFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -182,13 +182,13 @@ InstallWelcome	Back	PushButton	164	243	6
 InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
 InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
 InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
+InstallWelcome	Image	Bitmap	0	0	122	234	1048577		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	Banner	Bitmap	297	0	77	44	1048577		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]		
@@ -199,7 +199,7 @@ LicenseAgreement	DlgTitle	Text	13	6	280
 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	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 MaintenanceType	BannerLine	Line	0	44	374	0	1				
 MaintenanceType	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 MaintenanceType	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -218,11 +218,11 @@ MaintenanceType	Text3	Text	80	192	260	35
 MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
 MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
 MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
+MaintenanceWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
 MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
 MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+OutOfSpace	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 OutOfSpace	BannerLine	Line	0	44	374	0	1				
 OutOfSpace	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 OutOfSpace	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -235,12 +235,12 @@ OutOfSpace	Resume	PushButton	301	243	66
 PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
 PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
 PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
+PatchWelcome	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
 PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
 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	297	0	77	44	1		BannerBmp		
+ReadyToInstall	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToInstall	BannerLine	Line	0	44	374	0	1				
 ReadyToInstall	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToInstall	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -254,7 +254,7 @@ ReadyToInstall	DlgTitle2	Text	13	6	280	2
 ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
 ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
 ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+ReadyToRemove	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 ReadyToRemove	BannerLine	Line	0	44	374	0	1				
 ReadyToRemove	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToRemove	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -272,7 +272,7 @@ SetupCompleteError	DlgLine	Line	0	234	37
 SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
 SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
 SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	125	234	1		ImageBmp		
+SetupCompleteError	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
 SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
 SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
@@ -284,7 +284,7 @@ SetupCompleteSuccess	CheckForUpdatesText
 SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
 SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
 SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	125	234	1		ImageBmp	CheckBoxUpdates	
+SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1048577		ImageBmp	CheckBoxUpdates	
 SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
 SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
 SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
@@ -308,7 +308,7 @@ SetupInitialization	ActionText	Text	135
 SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
 SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
 SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	125	234	1		ImageBmp		
+SetupInitialization	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
 SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
 SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
@@ -318,7 +318,7 @@ SetupInterrupted	DlgLine	Line	0	234	374
 SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
 SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
 SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	125	234	1		ImageBmp		
+SetupInterrupted	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
 SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
 SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
@@ -326,7 +326,7 @@ SetupInterrupted	TextLine2	Text	135	55	2
 SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
 SetupProgress	ActionText	Text	59	100	275	12	3				
 SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupProgress	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupProgress	BannerLine	Line	0	44	374	0	1				
 SetupProgress	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupProgress	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -347,13 +347,13 @@ SetupProgress	TextTime	Text	59	139	96	12
 SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
 SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
 SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	125	234	1		ImageBmp		
+SetupResume	Image	Bitmap	0	0	122	234	1048577		ImageBmp		
 SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
 SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
 SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
 SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
 SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
+SetupType	Banner	Bitmap	297	0	77	44	1048577		BannerBmp		
 SetupType	BannerLine	Line	0	44	374	0	1				
 SetupType	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
 SetupType	Branding2	Text	3	228	92	13	65537		[ProductName]		
@@ -373,5 +373,5 @@ SplashBitmap	Branding1	Text	4	229	92	13
 SplashBitmap	Branding2	Text	3	228	92	13	65537		[ProductName]		
 SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
 SplashBitmap	DlgLine	Line	95	234	279	0	1				
-SplashBitmap	Image	Bitmap	13	12	113	211	1		ImageBmp		
+SplashBitmap	Image	Bitmap	13	12	113	211	1048577		ImageBmp		
 SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	

Modified: openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobanner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobanner.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobitmap.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbanner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbanner.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1842939&r1=1842938&r2=1842939&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message