Mon Nov 21 08:46:11 UTC 2016

basctl/CppunitTest_basctl_dialogs_test.mk             |    4 +
 chart2/CppunitTest_chart2_dialogs_test.mk             |    9 +++
 connectivity/Library_ado.mk                           |    3 +
 connectivity/Library_jdbc.mk                          |    3 +
 cui/CppunitTest_cui_dialogs_test.mk                   |    4 +
 cui/Library_cui.mk                                    |    3 +
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk         |    1 
 dbaccess/CppunitTest_dbaccess_dialogs_test.mk         |    4 +
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk          |    1 
 desktop/CppunitTest_desktop_dialogs_test.mk           |    4 +
 filter/CppunitTest_filter_dialogs_test.mk             |    4 +
 filter/Module_filter.mk                               |    2 
 filter/UIConfig_filter.mk                             |   29 ++++++++++++
 filter/UIConfig_xsltdlg.mk                            |   29 ------------
 formula/CppunitTest_formula_dialogs_test.mk           |    4 +
 fpicker/CppunitTest_fpicker_dialogs_test.mk           |    4 +
 include/osl/test/uniquepipename.hxx                   |   41 ++++++++++++++++++
 include/unotest/uniquepipename.hxx                    |   37 ----------------
 reportdesign/CppunitTest_reportdesign_dialogs_test.mk |    4 +
 sal/CppunitTest_sal_osl_pipe.mk                       |    1 
 sal/qa/osl/pipe/osl_Pipe.cxx                          |    2 
 sc/CppunitTest_sc_bugfix_test.mk                      |    4 +
 sc/CppunitTest_sc_filters_test.mk                     |    4 +
 sc/CppunitTest_sc_screenshots.mk                      |    5 ++
 sd/CppunitTest_sd_dialogs_test.mk                     |    5 ++
 sd/Library_sd.mk                                      |    3 +
 sfx2/CppunitTest_sfx2_classification.mk               |   10 +++-
 sfx2/CppunitTest_sfx2_dialogs_test.mk                 |    4 +
 solenv/gbuild/CppunitTest.mk                          |   10 ++++
 starmath/CppunitTest_starmath_dialogs_test.mk         |    4 +
 svtools/CppunitTest_svtools_dialogs_test.mk           |    4 +
 svx/CppunitTest_svx_dialogs_test.mk                   |    4 +
 sw/CppunitTest_sw_dialogs_test.mk                     |    8 +++
 sw/CppunitTest_sw_docbookexport.mk                    |    4 +
 sw/CppunitTest_sw_mailmerge.mk                        |    4 +
 unotest/Library_unotest.mk                            |    1 
 unotest/source/cpp/officeconnection.cxx               |    4 -
 unotest/source/cpp/uniquepipename.cxx                 |   40 -----------------
 uui/CppunitTest_uui_dialogs_test.mk                   |    4 +
 vcl/CppunitTest_vcl_dialogs_test.mk                   |    4 +
 xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk   |    4 +
 41 files changed, 210 insertions(+), 113 deletions(-)

New commits:
commit 04f49d0375788239d0c636470d4c971e3bbc73f7
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 21 00:20:41 2016 +0100

    add missing dep
    
    Change-Id: I932f1383f37a45c56dc3ae6d0b5485d80f3325ad

diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk
index f8e080a..d0c9472 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -52,4 +52,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_docbookexport,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_docbookexport))
 
+$(eval $(call gb_CppunitTest_use_packages,sw_docbookexport,\
+	filter_docbook \
+))
+
 # vim: set noet sw=4 ts=4:
commit c80c6b5694bd14367e898f659e82013167fc7d97
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 20:24:35 2016 +0100

    add missing dep
    
    Change-Id: I0d2a2c32d99ee11e63a2363f8a17bd4efd72cc22

diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk
index 2e691cc..1bdc56c 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -42,4 +42,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\
 	svx \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,sfx2_classification,\
+	sfx2_classification \
+))
+
 # vim: set noet sw=4 ts=4:
commit 6750aa27e5d94a7d372fec9dc346b1c5940a0bfe
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 20:18:08 2016 +0100

    use the right config dep
    
    Change-Id: I1d387ac566008efd5b0fe7e5e4a4f1bc8462107f

diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk
index f7b5f7e..2e691cc 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_rdb,sfx2_classification,services))
 
-$(eval $(call gb_CppunitTest_use_configuration,sfx2_classification))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\
 	svx \
commit 22b53e93f36a14ae04d93121cf90cc8f9de6f284
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 17:14:00 2016 +0100

    add missing deps for MS XML 2003 filter
    
    Change-Id: I4f3b43032f99031bd505d8ec2f50596c2f2c0457

diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index d6af092..2305b29 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -121,4 +121,8 @@ endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_bugfix_test))
 
+$(eval $(call gb_CppunitTest_use_packages,sc_bugfix_test,\
+	filter_xslt \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 012da5f..ed575a0 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -113,4 +113,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 
+$(eval $(call gb_CppunitTest_use_packages,sc_filters_test,\
+	filter_xslt \
+))
+
 # vim: set noet sw=4 ts=4:
commit 844735778b64d8fa12cb8d7a5b00e549ae81ed5b
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 14:00:51 2016 +0100

    rename makefile to match the module name
    
    Change-Id: I21685599e42c961407fa3de40e69e6e54dfe7c79

diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 9b6421c..884ec28 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_l10n_targets,filter,\
 	AllLangResTarget_pdffilter \
 	AllLangResTarget_t602filter \
 	AllLangResTarget_xsltdlg \
-	UIConfig_xsltdlg \
+	UIConfig_filter \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_filter.mk
similarity index 100%
rename from filter/UIConfig_xsltdlg.mk
rename to filter/UIConfig_filter.mk
commit a1e9e5848c2018a91f36dffa6ffda67e16446877
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 13:51:28 2016 +0100

    add missing resource dep
    
    Change-Id: I018d04217dd25661562dde7e4f84ef32c5a3eb6a

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 6a267d4..337cb61 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -578,4 +578,7 @@ endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE
 
 endif # ENABLE_SDREMOTE=TRUE
 
+# Runtime dependency for unit-tests
+$(eval $(call gb_Library_use_restarget,sd,sd))
+
 # vim: set noet sw=4 ts=4:
commit 938dc595a2c1598e73c112150e1abb848dac4453
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 13:38:30 2016 +0100

    add missing dep
    
    Change-Id: I518d86870a0970672d618379a6f965c69c04759d

diff --git a/sw/CppunitTest_sw_dialogs_test.mk b/sw/CppunitTest_sw_dialogs_test.mk
index af26da3..6be014b 100644
--- a/sw/CppunitTest_sw_dialogs_test.mk
+++ b/sw/CppunitTest_sw_dialogs_test.mk
@@ -73,4 +73,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_dialogs_test,\
 	modules/swriter \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,sw_dialogs_test,\
+	extras_palettes \
+))
+
 # vim: set noet sw=4 ts=4:
commit b55d17471f73b843943269c6cbd30f99995d8354
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 12:42:07 2016 +0100

    add missing component
    
    Change-Id: I53d50f8e338fcc64e24370a80ce390f7a2be34ba

diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 5a83a4b..67f6905 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
     dbaccess/util/dbu \
     filter/source/config/cache/filterconfig1 \
     framework/util/fwk \
+    io/source/io \
     i18npool/util/i18npool \
     linguistic/source/lng \
     package/source/xstor/xstor \
commit 7fe1b39e8abe68357c88536923b7058807b32119
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 09:59:58 2016 +0100

    add missing component
    
    Change-Id: I8b6f6d650c011fc0611d6933894bc64a780ff8c0

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index c41c3fe..8eb24dd 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\
     filter/source/config/cache/filterconfig1 \
     forms/util/frm \
     framework/util/fwk \
+    io/source/io \
     i18npool/util/i18npool \
     linguistic/source/lng \
     oox/util/oox \
commit 58e2f9a3e2b11d00aec85b2fdfd0fbf31101bf31
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 09:58:31 2016 +0100

    add missing dep on affine UNO env
    
    Change-Id: I0e88c205f4fa34c0001d1fc1f53b9a8bb6dcd2d8

diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index c5e74e1..d765660 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -79,4 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,ado,\
 	connectivity/source/drivers/ado/adoimp \
 ))
 
+# Runtime dependency for unit-tests
+$(call gb_Library_get_target,ado) :| $(call gb_Library_get_target,affine_uno_uno)
+
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 68282c0..c626aad 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -70,4 +70,7 @@ $(eval $(call gb_Library_add_exception_objects,jdbc,\
 	connectivity/source/drivers/jdbc/ContextClassLoader \
 ))
 
+# Runtime dependency for unit-tests
+$(call gb_Library_get_target,jdbc) :| $(call gb_Library_get_target,affine_uno_uno)
+
 # vim: set noet sw=4 ts=4:
commit 485f839a754982997f4b7e7f34818701279def84
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 20 09:23:09 2016 +0100

    add missing resource dep
    
    Change-Id: If71616f2a8f1bcd42bd89a9192ec0e1d3fdaba0e

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index ea46629..6a63a1d 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -212,4 +212,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/uno/services \
 ))
 
+# Runtime dependency for unit-tests
+$(eval $(call gb_Library_use_restarget,cui,cui))
+
 # vim: set noet sw=4 ts=4:
commit 3ea0ecdcf48bda7b537802b6433bfeb77276d955
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Nov 19 23:30:35 2016 +0100

    add missing dep
    
    Change-Id: I7ebf3d83833424a089a6befb1fe038fdd85ead35

diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk
index 142813e..10c81d0 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -71,4 +71,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_dialogs_test,\
 	svx \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,chart2_dialogs_test,\
+	extras_palettes \
+))
+
 # vim: set noet sw=4 ts=4:
commit bbb9264610a179720877b884060aeaed2008967b
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Nov 19 21:53:20 2016 +0100

    add missing deps on ui files
    
    Change-Id: I28bb2a33c02d8eadced584d3d3f2b62b2e847324

diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk b/basctl/CppunitTest_basctl_dialogs_test.mk
index a358372..5a290bf 100644
--- a/basctl/CppunitTest_basctl_dialogs_test.mk
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,basctl_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,basctl_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,basctl_dialogs_test,\
+	modules/BasicIDE \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk
index b7dd867..142813e 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -66,4 +66,9 @@ $(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,chart2_dialogs_test,\
+	modules/schart \
+	svx \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/cui/CppunitTest_cui_dialogs_test.mk b/cui/CppunitTest_cui_dialogs_test.mk
index 223404a..e1c07fa 100644
--- a/cui/CppunitTest_cui_dialogs_test.mk
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -65,4 +65,8 @@ $(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,cui_dialogs_test,\
+	cui \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
index fbc4ebe..704764b 100644
--- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,dbaccess_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,dbaccess_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,dbaccess_dialogs_test,\
+	dbaccess \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk
index a00620c..d8117a4 100644
--- a/desktop/CppunitTest_desktop_dialogs_test.mk
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,desktop_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,desktop_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,desktop_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,desktop_dialogs_test,\
+	desktop \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/filter/CppunitTest_filter_dialogs_test.mk b/filter/CppunitTest_filter_dialogs_test.mk
index b901076..5f98799 100644
--- a/filter/CppunitTest_filter_dialogs_test.mk
+++ b/filter/CppunitTest_filter_dialogs_test.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,filter_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,filter_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,filter_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,filter_dialogs_test,\
+	filter \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/formula/CppunitTest_formula_dialogs_test.mk b/formula/CppunitTest_formula_dialogs_test.mk
index d12f2d9..7cc881c 100644
--- a/formula/CppunitTest_formula_dialogs_test.mk
+++ b/formula/CppunitTest_formula_dialogs_test.mk
@@ -58,4 +58,8 @@ $(eval $(call gb_CppunitTest_use_rdb,formula_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,formula_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,formula_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,formula_dialogs_test,\
+	formula \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk b/fpicker/CppunitTest_fpicker_dialogs_test.mk
index 079f759..1bf3ae1 100644
--- a/fpicker/CppunitTest_fpicker_dialogs_test.mk
+++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk
@@ -58,4 +58,8 @@ $(eval $(call gb_CppunitTest_use_rdb,fpicker_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,fpicker_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,fpicker_dialogs_test,\
+	fps \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
index 932ff6e..7ec61e8 100644
--- a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
+++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,reportdesign_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,reportdesign_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,reportdesign_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,reportdesign_dialogs_test,\
+	modules/dbreport \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk
index ac1aa41..ea42cb8b 100644
--- a/sc/CppunitTest_sc_screenshots.mk
+++ b/sc/CppunitTest_sc_screenshots.mk
@@ -58,6 +58,11 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_screenshots,services))
 
 $(eval $(call gb_CppunitTest_use_instdir_configuration,sc_screenshots))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sc_screenshots,\
+	cui \
+	modules/scalc \
+))
+
 $(call gb_CppunitTest_get_target,sc_screenshots) : $(call gb_AllLangResTarget_get_target,sc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk
index 6bbce33..f82eca4 100644
--- a/sd/CppunitTest_sd_dialogs_test.mk
+++ b/sd/CppunitTest_sd_dialogs_test.mk
@@ -68,4 +68,9 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,sd_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,sd_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sd_dialogs_test,\
+	modules/sdraw \
+	modules/simpress \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk
index d2f797c..f7b5f7e 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -38,4 +38,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sfx2_classification,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sfx2_classification))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\
+	svx \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk b/sfx2/CppunitTest_sfx2_dialogs_test.mk
index 1ea68c0..55129c0 100644
--- a/sfx2/CppunitTest_sfx2_dialogs_test.mk
+++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sfx2_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,sfx2_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_dialogs_test,\
+	sfx \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 4a9c050..63317d8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -380,6 +380,16 @@ $(call gb_CppunitTest_get_target,$(1)) :\
 
 endef
 
+define gb_CppunitTest_use_uiconfig
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_UIConfig_get_target,$(2))
+
+endef
+
+define gb_CppunitTest_use_uiconfigs
+$(foreach uiconfig,$(2),$(call gb_CppunitTest_use_uiconfig,$(1),$(uiconfig)))
+
+endef
+
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest_get_linktarget,$$(1)),$$(2),$$(3),CppunitTest_$$(1))
 
diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk b/starmath/CppunitTest_starmath_dialogs_test.mk
index d5e6866..a1147f3 100644
--- a/starmath/CppunitTest_starmath_dialogs_test.mk
+++ b/starmath/CppunitTest_starmath_dialogs_test.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,starmath_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,starmath_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,starmath_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,starmath_dialogs_test,\
+	modules/smath \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk b/svtools/CppunitTest_svtools_dialogs_test.mk
index 38b50cb..7706985 100644
--- a/svtools/CppunitTest_svtools_dialogs_test.mk
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,svtools_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,svtools_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,svtools_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,svtools_dialogs_test,\
+	svt \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/svx/CppunitTest_svx_dialogs_test.mk b/svx/CppunitTest_svx_dialogs_test.mk
index cf84194..ff251ea 100644
--- a/svx/CppunitTest_svx_dialogs_test.mk
+++ b/svx/CppunitTest_svx_dialogs_test.mk
@@ -66,4 +66,8 @@ $(eval $(call gb_CppunitTest_use_rdb,svx_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,svx_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,svx_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,svx_dialogs_test,\
+	svx \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_dialogs_test.mk b/sw/CppunitTest_sw_dialogs_test.mk
index 42ae22b..af26da3 100644
--- a/sw/CppunitTest_sw_dialogs_test.mk
+++ b/sw/CppunitTest_sw_dialogs_test.mk
@@ -69,4 +69,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,sw_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,sw_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_dialogs_test,\
+	modules/swriter \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index aa037fc..693a5e2 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -90,4 +90,8 @@ $(eval $(call gb_CppunitTest_set_include,sw_mailmerge,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_mailmerge,\
+	modules/swriter \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/uui/CppunitTest_uui_dialogs_test.mk b/uui/CppunitTest_uui_dialogs_test.mk
index 9c7ed39..385c467 100644
--- a/uui/CppunitTest_uui_dialogs_test.mk
+++ b/uui/CppunitTest_uui_dialogs_test.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,uui_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,uui_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,uui_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,uui_dialogs_test,\
+	uui \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk b/vcl/CppunitTest_vcl_dialogs_test.mk
index 2bebfe4..d2ae83c 100644
--- a/vcl/CppunitTest_vcl_dialogs_test.mk
+++ b/vcl/CppunitTest_vcl_dialogs_test.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,vcl_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,vcl_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,vcl_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,vcl_dialogs_test,\
+	vcl \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
index f30b5c2..a5f6093 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
@@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,xmlsecurity_dialogs_test,services))
 # $(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_dialogs_test))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,xmlsecurity_dialogs_test))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,xmlsecurity_dialogs_test,\
+	xmlsec \
+))
+
 # vim: set noet sw=4 ts=4:
commit c87ecb0e18b11bc8ff4043ae17be097c73faf2d1
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Nov 19 20:35:07 2016 +0100

    remove dep on unotest from osl_Pipe test
    
    Change-Id: I5f5862a684e52bd3d1336fa9f8cffa77cdebbe4c

diff --git a/unotest/source/cpp/uniquepipename.cxx b/include/osl/test/uniquepipename.hxx
similarity index 97%
rename from unotest/source/cpp/uniquepipename.cxx
rename to include/osl/test/uniquepipename.hxx
index ed6edcb..bdffb28 100644
--- a/unotest/source/cpp/uniquepipename.cxx
+++ b/include/osl/test/uniquepipename.hxx
@@ -22,8 +22,8 @@
 #include "osl/process.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
-#include "unotest/uniquepipename.hxx"
 
+namespace osl {
 namespace test {
 
 OUString uniquePipeName(OUString const & name) {
@@ -36,5 +36,6 @@ OUString uniquePipeName(OUString const & name) {
 }
 
 }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotest/uniquepipename.hxx b/include/unotest/uniquepipename.hxx
deleted file mode 100644
index f406dc1..0000000
--- a/include/unotest/uniquepipename.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
-#define INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
-
-#include <sal/config.h>
-
-#include <rtl/ustring.hxx>
-#include <unotest/detail/unotestdllapi.hxx>
-
-namespace test {
-
-// Create a system-wide unique name (for use with osl::Pipe):
-OOO_DLLPUBLIC_UNOTEST OUString uniquePipeName(OUString const & name);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
index 932a138..cf909ea 100644
--- a/sal/CppunitTest_sal_osl_pipe.mk
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
     sal \
-    unotest \
 	$(gb_UWINAPI) \
 ))
 
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 543b730..3e72763 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -24,9 +24,9 @@
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
-#include "unotest/uniquepipename.hxx"
 #include <rtl/ustring.hxx>
 
+#include <osl/test/uniquepipename.hxx>
 #include <osl/thread.hxx>
 
 #include <osl/mutex.hxx>
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 315447c..558b8a7 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_exception_objects,unotest,\
     unotest/source/cpp/macros_test \
     unotest/source/cpp/officeconnection \
     unotest/source/cpp/toabsolutefileurl \
-    unotest/source/cpp/uniquepipename \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index 326b332..51cc6df 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -27,12 +27,12 @@
 #include "cppuhelper/bootstrap.hxx"
 #include "cppunit/TestAssert.h"
 #include "osl/process.h"
+#include "osl/test/uniquepipename.hxx"
 #include "osl/time.h"
 #include "sal/macros.h"
 #include "sal/types.h"
 #include "unotest/officeconnection.hxx"
 #include "unotest/toabsolutefileurl.hxx"
-#include "unotest/uniquepipename.hxx"
 
 #include "getargument.hxx"
 
@@ -53,7 +53,7 @@ void OfficeConnection::setUp() {
             "soffice",
             &argSoffice));
     if (argSoffice.match("path:")) {
-        desc = "pipe,name=" + uniquePipeName("oootest");
+        desc = "pipe,name=" + osl::test::uniquePipeName("oootest");
         OUString noquickArg("--quickstart=no");
         OUString norestoreArg("--norestore");
         OUString nologoArg("--nologo");
