sc/CppunitTest_sc_annotationobj.mk | 8 ++++----
sc/CppunitTest_sc_annotationshapeobj.mk | 8 ++++----
sc/CppunitTest_sc_annotationsobj.mk | 8 ++++----
sc/CppunitTest_sc_cellrangeobj.mk | 10 +++++-----
sc/CppunitTest_sc_chart_regression_test.mk | 14 +++++++-------
sc/CppunitTest_sc_databaserangeobj.mk | 6 +++---
sc/CppunitTest_sc_datapilotfieldobj.mk | 8 ++++----
sc/CppunitTest_sc_datapilottableobj.mk | 8 ++++----
sc/CppunitTest_sc_editfieldobj_cell.mk | 8 ++++----
sc/CppunitTest_sc_editfieldobj_header.mk | 8 ++++----
sc/CppunitTest_sc_filters_test.mk | 10 +++++-----
sc/CppunitTest_sc_html_export_test.mk | 16 ++++++++--------
sc/CppunitTest_sc_macros_test.mk | 18 +++++++++---------
sc/CppunitTest_sc_modelobj.mk | 8 ++++----
sc/CppunitTest_sc_namedrangeobj.mk | 8 ++++----
sc/CppunitTest_sc_namedrangesobj.mk | 8 ++++----
sc/CppunitTest_sc_opencl_test.mk | 10 +++++-----
sc/CppunitTest_sc_outlineobj.mk | 8 ++++----
sc/CppunitTest_sc_rangelst_test.mk | 12 ++++++------
sc/CppunitTest_sc_subsequent_export_test.mk | 12 ++++++------
sc/CppunitTest_sc_subsequent_filters_test.mk | 15 ++++++++-------
sc/CppunitTest_sc_tableautoformatfield.mk | 6 +++---
sc/CppunitTest_sc_tablesheetobj.mk | 8 ++++----
sc/CppunitTest_sc_tablesheetsobj.mk | 6 +++---
sc/CppunitTest_sc_ucalc.mk | 8 ++++----
sc/qa/unit/subsequent_filters-test.cxx | 2 +-
26 files changed, 121 insertions(+), 120 deletions(-)
New commits:
commit 7847962863c7c2c23c7421be2b046c20c381916b
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 26 01:04:46 2014 +0200
sort libraries and components in sc test makefiles
Change-Id: I38cda4e1ba520c9bb15f71b27543cb80fd696424
diff --git a/sc/CppunitTest_sc_annotationobj.mk
b/sc/CppunitTest_sc_annotationobj.mk
index 5eb53c0..52cf7ab 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_annotationobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -82,13 +82,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_annotationobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk
b/sc/CppunitTest_sc_annotationshapeobj.mk
index ac335e3..3e7d01d 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -79,13 +79,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_annonationshapeobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_annotationsobj.mk
b/sc/CppunitTest_sc_annotationsobj.mk
index f91f1d3..b976a9c 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_annotationsobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -82,13 +82,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_annotationsobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk
b/sc/CppunitTest_sc_cellrangeobj.mk
index 804e454..2d755ad 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -36,14 +36,14 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj,
\
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -76,19 +76,19 @@ $(eval $(call
gb_CppunitTest_use_components,sc_cellrangeobj,\
filter/source/storagefilterdetect/storagefd \
forms/util/frm \
framework/util/fwk \
- i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk
b/sc/CppunitTest_sc_chart_regression_test.mk
index 35866e1..6b78978 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -32,14 +32,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_chart_regression_test, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- subsequenttest \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -65,8 +65,8 @@ $(eval $(call
gb_CppunitTest_use_ure,sc_chart_regression_test))
$(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
basic/util/sb \
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -81,15 +81,15 @@ $(eval $(call
gb_CppunitTest_use_components,sc_chart_regression_test,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scaddins/source/analysis/analysis \
+ scaddins/source/datefunc/date \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk
b/sc/CppunitTest_sc_databaserangeobj.mk
index 442dcfd..289ae77 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -42,8 +42,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_databaserangeobj, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,12 +81,12 @@ $(eval $(call
gb_CppunitTest_use_components,sc_databaserangeobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
sc/util/vbaobj \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk
b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 1786af5..eb604af 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,13 +81,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_datapilotfieldobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk
b/sc/CppunitTest_sc_datapilottableobj.mk
index 76ffe9a..d55d3c7 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_datapilottableobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,13 +81,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_datapilottableobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk
b/sc/CppunitTest_sc_editfieldobj_cell.mk
index cc4d5d1..05f9aab 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -80,13 +80,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_editfieldobj_cell,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk
b/sc/CppunitTest_sc_editfieldobj_header.mk
index 049becc..98dc86f 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -80,13 +80,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_editfieldobj_header,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index ff12276..71f4d7e 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -50,8 +50,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -76,8 +76,8 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_filters_test))
$(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
basic/util/sb \
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -92,16 +92,16 @@ $(eval $(call
gb_CppunitTest_use_components,sc_filters_test,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
- sc/util/sc \
- sc/util/scfilt \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
+ sc/util/sc \
+ sc/util/scfilt \
sfx2/util/sfx \
sot/util/sot \
svl/util/svl \
+ svtools/util/svt \
svx/util/svx \
svx/util/svxcore \
- svtools/util/svt \
toolkit/util/tk \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
diff --git a/sc/CppunitTest_sc_html_export_test.mk
b/sc/CppunitTest_sc_html_export_test.mk
index f4ee040..1a66cf6 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -42,8 +42,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_html_export_test, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -71,25 +71,27 @@ $(eval $(call
gb_CppunitTest_use_components,sc_html_export_test,\
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
+ eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
filter/source/storagefilterdetect/storagefd \
forms/util/frm \
framework/util/fwk \
+ i18npool/source/search/i18nsearch \
i18npool/util/i18npool \
linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/source/dlgprov/dlgprov \
+ scripting/source/vbaevents/vbaevents \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- scripting/source/vbaevents/vbaevents \
- scripting/source/dlgprov/dlgprov \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
@@ -103,10 +105,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_html_export_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
- xmloff/util/xo \
- eventattacher/source/evtatt \
- i18npool/source/search/i18nsearch \
vbahelper/util/msforms \
+ xmloff/util/xo \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_html_export_test))
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 8298b63..c55be35 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -37,14 +37,14 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- subsequenttest \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -74,25 +74,27 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
+ eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
filter/source/storagefilterdetect/storagefd \
forms/util/frm \
framework/util/fwk \
+ i18npool/source/search/i18nsearch \
i18npool/util/i18npool \
linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/source/dlgprov/dlgprov \
+ scripting/source/vbaevents/vbaevents \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- scripting/source/vbaevents/vbaevents \
- scripting/source/dlgprov/dlgprov \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
@@ -106,10 +108,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_macros_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
- xmloff/util/xo \
- eventattacher/source/evtatt \
- i18npool/source/search/i18nsearch \
vbahelper/util/msforms \
+ xmloff/util/xo \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 4a3f1f3..bcdd9db 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -36,14 +36,14 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,13 +81,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk
b/sc/CppunitTest_sc_namedrangeobj.mk
index b405008..605bfb6 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_namedrangeobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,13 +81,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_namedrangeobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk
b/sc/CppunitTest_sc_namedrangesobj.mk
index 724d61c..70a0aa7 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -36,14 +36,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_namedrangesobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -81,13 +81,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_namedrangesobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index 4adafd6..4fc6ecb 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -45,8 +45,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -72,8 +72,8 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_opencl_test))
$(eval $(call gb_CppunitTest_use_components,sc_opencl_test,\
basic/util/sb \
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -88,16 +88,16 @@ $(eval $(call gb_CppunitTest_use_components,sc_opencl_test,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
- sc/util/sc \
- sc/util/scfilt \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
+ sc/util/sc \
+ sc/util/scfilt \
sfx2/util/sfx \
sot/util/sot \
svl/util/svl \
+ svtools/util/svt \
svx/util/svx \
svx/util/svxcore \
- svtools/util/svt \
toolkit/util/tk \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index e319284..06c401a 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -36,14 +36,14 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \
sc \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
test \
- tl \
tk \
- subsequenttest \
+ tl \
ucbhelper \
unotest \
utl \
@@ -82,13 +82,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk
b/sc/CppunitTest_sc_rangelst_test.mk
index 2a394b1..08a3e53 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -52,8 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -80,8 +80,8 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_rangelst_test))
$(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
basic/util/sb \
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -95,15 +95,15 @@ $(eval $(call
gb_CppunitTest_use_components,sc_rangelst_test,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scaddins/source/analysis/analysis \
+ scaddins/source/datefunc/date \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk
b/sc/CppunitTest_sc_subsequent_export_test.mk
index 4d02d6b..7104722 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -44,8 +44,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -69,8 +69,8 @@ $(eval $(call
gb_CppunitTest_use_ure,sc_subsequent_export_test))
$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_export_test))
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -79,17 +79,17 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
filter/source/config/cache/filterconfig1 \
forms/util/frm \
framework/util/fwk \
- i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
- sc/util/sc \
- sc/util/scfilt \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
+ sc/util/sc \
+ sc/util/scfilt \
sfx2/util/sfx \
sot/util/sot \
svl/util/svl \
@@ -102,8 +102,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
xmloff/util/xo \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
+ xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index c4be9ee..62f5d01 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -40,14 +40,14 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
scqahelper \
sfx \
sot \
+ subsequenttest \
svl \
svt \
svx \
svxcore \
- subsequenttest \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -73,8 +73,8 @@ $(eval $(call
gb_CppunitTest_use_vcl,sc_subsequent_filters_test))
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
basic/util/sb \
- chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+ chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
@@ -83,17 +83,17 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_filters_test,\
filter/source/config/cache/filterconfig1 \
forms/util/frm \
framework/util/fwk \
- i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
- sc/util/sc \
- sc/util/scfilt \
scaddins/source/analysis/analysis \
scaddins/source/datefunc/date \
+ sc/util/sc \
+ sc/util/scfilt \
sfx2/util/sfx \
sot/util/sot \
svl/util/svl \
@@ -106,8 +106,8 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_filters_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
xmloff/util/xo \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
+ xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk
b/sc/CppunitTest_sc_tableautoformatfield.mk
index 4b7285c..07d2724 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -40,8 +40,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -77,13 +77,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_tableautoformatfield,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk
b/sc/CppunitTest_sc_tablesheetobj.mk
index bf9d53b..5df98b1 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -42,8 +42,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -76,19 +76,19 @@ $(eval $(call
gb_CppunitTest_use_components,sc_tablesheetobj,\
filter/source/storagefilterdetect/storagefd \
forms/util/frm \
framework/util/fwk \
- i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk
b/sc/CppunitTest_sc_tablesheetsobj.mk
index 60c1c22..4ba5589 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -42,8 +42,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj,
\
svx \
svxcore \
test \
- tl \
tk \
+ tl \
ucbhelper \
unotest \
utl \
@@ -82,13 +82,13 @@ $(eval $(call
gb_CppunitTest_use_components,sc_tablesheetsobj,\
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index fa5c3e9..48adfbd 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -92,17 +92,17 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_ucalc))
$(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
configmgr/source/configmgr \
framework/util/fwk \
- i18npool/util/i18npool \
i18npool/source/search/i18nsearch \
+ i18npool/util/i18npool \
sax/source/expatwrap/expwrap \
+ scaddins/source/analysis/analysis \
+ scaddins/source/datefunc/date \
+ scaddins/source/pricing/pricing \
sfx2/util/sfx \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
uui/util/uui \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scaddins/source/pricing/pricing \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc))
commit 7c6e236d13367594b7697f67e4dcc7d58643e038
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 26 00:51:45 2014 +0200
enable the test
Change-Id: Ic6867cfaff761ebda86a3a926a5f0becf937d4fd
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index a272047..c4be9ee 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -72,6 +72,7 @@ $(eval $(call
gb_CppunitTest_use_ure,sc_subsequent_filters_test))
$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_filters_test))
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
+ basic/util/sb \
chart2/source/controller/chartcontroller \
chart2/source/chartcore \
comphelper/util/comphelp \
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index cd32967..8cc9510 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -256,7 +256,7 @@ public:
CPPUNIT_TEST(testExternalRefCacheODS);
CPPUNIT_TEST(testHybridSharedStringODS);
CPPUNIT_TEST(testCopyMergedNumberFormats);
-// CPPUNIT_TEST(testVBAUserFunctionXLSM); // TODO : Macro not working in unit
test. Get this to work.
+ CPPUNIT_TEST(testVBAUserFunctionXLSM);
CPPUNIT_TEST_SUITE_END();
private:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
