[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/prj instsetoo_native/inc_sdkoo

[Matthias Seidel]

 connectivity/prj/build.lst                                   |    2 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |   12 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d75eb34a7154f1e8aaaddf1cbc57b8fe60860d12
Author: Matthias Seidel <mseidel at apache.org>
Date:   Mon Sep 11 14:46:15 2017 +0000

    Minor changes to Windows installer (SDK/InstallChangeFolder)

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index f893a630ae34..acd441e5b6a4 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -145,17 +145,17 @@ FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel
 InstallChangeFolder	Banner	Bitmap	0	0	374	44	1		BannerBmp		
 InstallChangeFolder	BannerLine	Line	0	44	376	0	1				
 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	Combo	DirectoryCombo	21	64	292	80	4128779	_BrowseProperty		Up	
+InstallChangeFolder	ComboText	Text	21	51	99	14	3		OOO_CONTROL_113	Combo	
 InstallChangeFolder	DlgDesc	Text	21	23	249	25	65539		OOO_CONTROL_114		
 InstallChangeFolder	DlgLine	Line	0	234	376	0	1				
 InstallChangeFolder	DlgTitle	Text	13	6	257	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	NewFolder	PushButton	335	64	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
+InstallChangeFolder	List	DirectoryList	21	90	345	97	11	_BrowseProperty		TailText	
+InstallChangeFolder	NewFolder	PushButton	348	64	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
 InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
+InstallChangeFolder	Tail	PathEdit	21	207	345	17	15	_BrowseProperty		OK	
 InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	310	64	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_121
+InstallChangeFolder	Up	PushButton	322	64	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_121
 InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
 InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
 InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
commit 97e67306667c2004167fcd2ae6c556788d427f9d
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Sep 10 13:56:45 2017 +0000

    main/connectivity/util depends on main/connectivity/java/sdbc_postgresql.
    
    The missing dependency was sometimes causing util to build first,
    failing due to missing sdbc_postgresql.xcu.
    
    Found by: Matthias Seidel
    Patch by: me

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 249cf339c84a..9244df25ed97 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -26,4 +26,4 @@ cn  connectivity\source\simpledbt                   nmake   -   all cn_simpledbt
 cn  connectivity\source\dbtools                     nmake   -   all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
 cn  connectivity\qa\connectivity\tools              nmake   -   all cn_qa_tools cn_inc NULL
 cn  connectivity\qa                                 nmake   -   all cn_qa cn_inc NULL
-cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab cn_postgresqldb NULL