diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-10-01 15:42:40 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-10-01 15:43:00 +0300 |
commit | cc1a1123dbed3c13180fbd43328168008692f224 (patch) | |
tree | b96a9bca12cc960acf79ed9dc3c30c24fe0682e6 | |
parent | Need -DBOOST_DETAIL_NO_CONTAINER_FWD here, too (diff) | |
download | core-cc1a1123dbed3c13180fbd43328168008692f224.tar.gz core-cc1a1123dbed3c13180fbd43328168008692f224.zip |
No vbaobj component if DISABLE_SCRIPTING
Change-Id: I8b00febb62502280afa6106289104af151caf9c5
-rw-r--r-- | sc/CppunitTest_sc_annotationshapeobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_cellrangeobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_chart_regression_test.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilottableobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_editfieldobj_cell.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_editfieldobj_header.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_macros_test.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_modelobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangeobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangesobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_rangelst_test.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tableautoformatfield.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tablesheetobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tablesheetsobj.mk | 3 |
15 files changed, 30 insertions, 15 deletions
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 9522e2779ea4..841b34a450a9 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 814e9cbbc1a1..b0a63217668a 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 1ca505b5b1d7..c45aa69857b4 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ scripting/source/basprov/basprov \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index d221fe5c4bd2..7d86cb573941 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 77f2b0be4e28..33207173b07a 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 3f75acb58ba3..b4f80621f9f6 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 32ac4577c5e8..ba55b6515208 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index c74f49433687..fca4947cef41 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -100,7 +100,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 4548f4bc37f4..de62eb6475d4 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ffca9b399833..c2f1d438dd09 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 49a87b49acf4..84d7f371c5a3 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index a97a4b1e258c..44c6b5266696 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ scripting/source/basprov/basprov \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 23cab33b98cc..94b311049ed4 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 1bf3bd956973..067ed9eea0ef 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 478dcb090552..e950830fdde0 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ |