diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-04-09 10:46:03 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-04-09 10:46:03 +0200 |
| commit | 3f16751ea2b2356f0d1c2b3a4fd93de9c71438b0 (patch) | |
| tree | 2ae8418a9c75506823d3de783223f7af0d989af1 | |
| parent | Calc UNO API test (diff) | |
| download | core-3f16751ea2b2356f0d1c2b3a4fd93de9c71438b0.tar.gz core-3f16751ea2b2356f0d1c2b3a4fd93de9c71438b0.zip | |
conditional formatting: Follow-up rebase fixes.
Change-Id: I1cce7e3052bf9e989b83ce73364c1a7b1928feac
| -rw-r--r-- | sc/CppunitTest_sc_condformats.mk | 4 | ||||
| -rw-r--r-- | sc/qa/extras/sccondformats.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk index 61f02ae61b88..590f9a87f5c0 100644 --- a/sc/CppunitTest_sc_condformats.mk +++ b/sc/CppunitTest_sc_condformats.mk @@ -71,8 +71,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_condformats,\ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ + fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ - filter/source/textfilterdetect/textfd \ forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ @@ -104,6 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_condformats,\ $(eval $(call gb_CppunitTest_use_configuration,sc_condformats)) +$(eval $(call gb_CppunitTest_use_filter_configuration,sc_condformats)) + $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_condformats)) # vim: set noet sw=4 ts=4: diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 4a664c43cc87..4d6e84b820dc 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -47,7 +47,7 @@ sal_Int32 ScConditionalFormatTest::nTest = 0; uno::Reference< lang::XComponent > ScConditionalFormatTest::mxComponent; ScConditionalFormatTest::ScConditionalFormatTest() - : CalcUnoApiTest("sc/qa/unit/data/ods") + : CalcUnoApiTest("/sc/qa/unit/data/ods") { } |