clean up

13 files changed, 15 insertions, 34 deletions

diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index a4ee45a10ff9..0935d900fa9b 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
@@ -127,12 +126,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 4d4da30e004b..0c746c2debb3 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -133,12 +133,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index ff2f4e8cc3ee..eb0e87b58fbe 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_databaserangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 096b37f4bc02..945be2b97278 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 921b576864ef..a08d5557d24b 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilottableobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index a200570abe5c..c0ead8a1dd33 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -121,12 +121,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index bdfd820a350b..af5ad014159d 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -122,12 +122,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_macros_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 33cd57d050fa..11d23d2132a5 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 1e6024090521..807e8a14a5fc 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangesobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index d814ddab6d7e..941bfeddac81 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -134,12 +134,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 2e5a2c706b19..862617b32c11 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index b35754869e98..0d23ae6c2e53 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
@@ -126,10 +125,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 57947934bc1d..79774b4bf1ed 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -124,10 +124,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4: