diff options
Diffstat (limited to 'sc')
24 files changed, 48 insertions, 24 deletions
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index a33164371afe..b6bdef73cddb 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c91923061d58..195dea16e5d0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) + $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index c7fbb6731750..4eeb3645c745 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b7d1fb6be404..b09b0318b1da 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f0788fb0fd6b..f8988749dbb0 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 1636112f43b0..31832f2364ab 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 6e5fa7076955..1826fb887bd5 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 7b47240e0138..009aa66f1fb8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index c61b4a2fbbf6..09df0f2a96b5 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -78,9 +78,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a24f391b9c09..3fc1b7c77df6 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 42a48f870730..cb8f0a53cf9d 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) + $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ff9ad582d92e..9d30c411f359 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 192bbbd70c08..893abdf5ea9a 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 6933c2583da0..9bd621db1f74 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) + $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 982ec6e4b35a..2f5dd35a7ae1 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index b72bb005305f..e526b1750618 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) + $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 2bacb8f2725c..0c9220419fd0 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index c7b7fcd827cf..2f9cb97fd71d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 3948bcfb04ec..24cc9b7e50c7 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -77,9 +77,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) + $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 96cb69132a70..ed74a69202b6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -84,9 +84,10 @@ $(eval $(call gb_Library_use_libraries,sc,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sc)) + $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 4c39cf1f40d3..b22f0c0eaca1 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,scd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scd)) + $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index d38d40b97027..8a8e6fe0d183 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scfilt)) + $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 7f94c6193f5e..86f7f8c4d0f8 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,scui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scui)) + $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 30eb16d059ff..e0e71a0da812 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) + $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ |