Renamed the file to make room for the header version of the same test.

This ScEditFieldObj is used for both cell fields and header/footer
fields.

Change-Id: I8c51de5d173ae934ea604c68030cd84b13f90ef3

3 files changed, 15 insertions, 14 deletions

diff --git a/sc/CppunitTest_sc_editfieldobj.mk b/sc/CppunitTest_sc_editfieldobj.mk
index 2e68c1e52f0e..c14dc4d30c0c 100644
--- a/sc/CppunitTest_sc_editfieldobj.mk
+++ b/sc/CppunitTest_sc_editfieldobj.mk
@@ -31,7 +31,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj, \
-    sc/qa/extras/sceditfieldobj \
+    sc/qa/extras/sceditfieldobj-cell \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj, \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 18ab35875f60..926ac33da6a8 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
     CppunitTest_sc_namedrangesobj \
     CppunitTest_sc_tablesheetobj \
     CppunitTest_sc_tablesheetsobj \
+    CppunitTest_sc_editfieldobj \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/qa/extras/sceditfieldobj.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index d5a22adb435d..962834a4c630 100644
--- a/sc/qa/extras/sceditfieldobj.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -42,10 +42,10 @@
 
 namespace sc_apitest {
 
-class ScEditFieldObj : public UnoApiTest, apitest::XTextField, apitest::XTextContent
+class ScEditFieldObj_Cell : public UnoApiTest, apitest::XTextField, apitest::XTextContent
 {
 public:
-    ScEditFieldObj();
+    ScEditFieldObj_Cell();
 
     virtual void setUp();
     virtual void tearDown();
@@ -54,7 +54,7 @@ public:
     virtual uno::Reference<text::XTextRange> getTextRange();
     virtual bool isAttachSupported() { return true; }
 
-    CPPUNIT_TEST_SUITE(ScEditFieldObj);
+    CPPUNIT_TEST_SUITE(ScEditFieldObj_Cell);
     // XTextField
     CPPUNIT_TEST(testGetPresentation);
     // XTextContent
@@ -68,19 +68,19 @@ private:
     static uno::Reference<text::XTextField> mxField;
 };
 
-sal_Int32 ScEditFieldObj::nTest = 0;
-uno::Reference<lang::XComponent> ScEditFieldObj::mxComponent;
-uno::Reference<text::XTextField> ScEditFieldObj::mxField;
+sal_Int32 ScEditFieldObj_Cell::nTest = 0;
+uno::Reference<lang::XComponent> ScEditFieldObj_Cell::mxComponent;
+uno::Reference<text::XTextField> ScEditFieldObj_Cell::mxField;
 
-ScEditFieldObj::ScEditFieldObj() {}
+ScEditFieldObj_Cell::ScEditFieldObj_Cell() {}
 
-void ScEditFieldObj::setUp()
+void ScEditFieldObj_Cell::setUp()
 {
     ++nTest;
     UnoApiTest::setUp();
 }
 
-void ScEditFieldObj::tearDown()
+void ScEditFieldObj_Cell::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
         closeDocument(mxComponent);
@@ -102,7 +102,7 @@ uno::Reference<text::XTextField> getNewField(const uno::Reference<lang::XMultiSe
 
 }
 
-uno::Reference<uno::XInterface> ScEditFieldObj::init()
+uno::Reference<uno::XInterface> ScEditFieldObj_Cell::init()
 {
     // Return a field that's already in the cell.
     if (!mxField.is())
@@ -132,14 +132,14 @@ uno::Reference<uno::XInterface> ScEditFieldObj::init()
     return mxField;
 }
 
-uno::Reference<text::XTextContent> ScEditFieldObj::getTextContent()
+uno::Reference<text::XTextContent> ScEditFieldObj_Cell::getTextContent()
 {
     // Return a field object that's not yet inserted.
     uno::Reference<lang::XMultiServiceFactory> xSM(mxComponent, UNO_QUERY_THROW);
     return uno::Reference<text::XTextContent>(getNewField(xSM), UNO_QUERY_THROW);
 }
 
-uno::Reference<text::XTextRange> ScEditFieldObj::getTextRange()
+uno::Reference<text::XTextRange> ScEditFieldObj_Cell::getTextRange()
 {
     // Use cell A2 for this.
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
@@ -153,7 +153,7 @@ uno::Reference<text::XTextRange> ScEditFieldObj::getTextRange()
     return xRange;
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj_Cell);
 
 CPPUNIT_PLUGIN_IMPLEMENT();