diff options
| -rw-r--r-- | sc/CppunitTest_sc_xcellrangesquery.mk (renamed from sc/CppunitTest_sc_unoapi_xcellrangesquery.mk) | 24 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/qa/extras/testdocuments/xcellrangesquery.ods (renamed from sc/qa/unoapi/testdocuments/xcellrangesquery.ods) | bin | 8881 -> 8881 bytes | |||
| -rw-r--r-- | sc/qa/extras/xcellrangesquery.cxx (renamed from sc/qa/unoapi/xcellrangesquery.cxx) | 0 | ||||
| -rw-r--r-- | test/source/unoapi_test.cxx | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/sc/CppunitTest_sc_unoapi_xcellrangesquery.mk b/sc/CppunitTest_sc_xcellrangesquery.mk index 2dc2f18547c1..a0e4bf45e26c 100644 --- a/sc/CppunitTest_sc_unoapi_xcellrangesquery.mk +++ b/sc/CppunitTest_sc_xcellrangesquery.mk @@ -28,13 +28,13 @@ # instead of those above. #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sc_unoapi_xcellrangesquery)) +$(eval $(call gb_CppunitTest_CppunitTest,sc_xcellrangesquery)) -$(eval $(call gb_CppunitTest_add_exception_objects,sc_unoapi_xcellrangesquery, \ - sc/qa/unoapi/xcellrangesquery \ +$(eval $(call gb_CppunitTest_add_exception_objects,sc_xcellrangesquery, \ + sc/qa/extras/xcellrangesquery \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sc_unoapi_xcellrangesquery, \ +$(eval $(call gb_CppunitTest_add_linked_libs,sc_xcellrangesquery, \ avmedia \ basegfx \ comphelper \ @@ -71,25 +71,25 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_unoapi_xcellrangesquery, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_set_include,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_set_include,sc_xcellrangesquery,\ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \ $$(INCLUDE) \ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_CppunitTest_add_api,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_add_api,sc_xcellrangesquery,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_unoapi_xcellrangesquery)) +$(eval $(call gb_CppunitTest_uses_ure,sc_xcellrangesquery)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_add_type_rdbs,sc_xcellrangesquery,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_add_components,sc_xcellrangesquery,\ basic/util/sb \ comphelper/util/comphelp \ dbaccess/util/dba \ @@ -118,14 +118,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_unoapi_xcellrangesquery,\ unoxml/source/service/unoxml \ )) -$(eval $(call gb_CppunitTest_add_old_components,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_add_old_components,sc_xcellrangesquery,\ configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ )) -$(eval $(call gb_CppunitTest_set_args,sc_unoapi_xcellrangesquery,\ +$(eval $(call gb_CppunitTest_set_args,sc_xcellrangesquery,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(SRCDIR)/sc/qa/unit/data/registry)" \ @@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sc_unoapi_xcellrangesquery,\ # 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_unoapi_xcellrangesquery) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc +$(call gb_CppunitTest_get_target,sc_xcellrangesquery) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc # vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 5b2d9fd27e42..eb855911b3a3 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_macros_test \ - CppunitTest_sc_unoapi_xcellrangesquery \ + CppunitTest_sc_xcellrangesquery \ JunitTest_sc_complex \ JunitTest_sc_unoapi \ )) diff --git a/sc/qa/unoapi/testdocuments/xcellrangesquery.ods b/sc/qa/extras/testdocuments/xcellrangesquery.ods Binary files differindex 562229c4070f..562229c4070f 100644 --- a/sc/qa/unoapi/testdocuments/xcellrangesquery.ods +++ b/sc/qa/extras/testdocuments/xcellrangesquery.ods diff --git a/sc/qa/unoapi/xcellrangesquery.cxx b/sc/qa/extras/xcellrangesquery.cxx index 3d395d60ebf2..3d395d60ebf2 100644 --- a/sc/qa/unoapi/xcellrangesquery.cxx +++ b/sc/qa/extras/xcellrangesquery.cxx diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index 0a8213e539ad..0a6f4aa4adf0 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -29,7 +29,7 @@ #include "test/unoapi_test.hxx" UnoApiTest::UnoApiTest() - : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sc/qa/unoapi/testdocuments")) + : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sc/qa/extras/testdocuments")) { } |