More sc CppunitTest fixes

...similar to 01d9f3fb "The ScOutlineObj test
still requires the fugdge."

Change-Id: Ib788f4d6f38eb1dc4b8e4856be8fd4a6ddd968b3

sc/qa/extras/scannotationobj.cxx

@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/unoapi_test.hxx>
+#include <test/calc_unoapi_test.hxx>
 #include <test/sheet/xsheetannotation.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -26,7 +26,7 @@ namespace sc_apitest {
 
 #define NUMBER_OF_TESTS 5
 
-class ScAnnontationObj : public UnoApiTest, apitest::XSheetAnnotation
+class ScAnnontationObj : public CalcUnoApiTest, apitest::XSheetAnnotation
 {
 public:
     ScAnnontationObj();
@@ -54,7 +54,7 @@ sal_Int32 ScAnnontationObj::nTest = 0;
 uno::Reference< lang::XComponent > ScAnnontationObj::mxComponent;
 
 ScAnnontationObj::ScAnnontationObj()
-       : UnoApiTest("/sc/qa/extras/testdocuments")
+       : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -99,7 +99,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init()
 void ScAnnontationObj::setUp()
 {
     nTest++;
-    UnoApiTest::setUp();
+    CalcUnoApiTest::setUp();
 }
 
 void ScAnnontationObj::tearDown()
@@ -107,7 +107,7 @@ void ScAnnontationObj::tearDown()
     if (nTest == NUMBER_OF_TESTS)
         closeDocument(mxComponent);
 
-    UnoApiTest::tearDown();
+    CalcUnoApiTest::tearDown();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationObj);

sc/qa/extras/scannotationsobj.cxx

@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/unoapi_test.hxx>
+#include <test/calc_unoapi_test.hxx>
 #include <test/sheet/xsheetannotations.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -22,7 +22,7 @@ namespace sc_apitest {
 
 #define NUMBER_OF_TESTS 2
 
-class ScAnnontationsObj : public UnoApiTest, apitest::XSheetAnnotations
+class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations
 {
 public:
     ScAnnontationsObj();
@@ -47,7 +47,7 @@ sal_Int32 ScAnnontationsObj::nTest = 0;
 uno::Reference< lang::XComponent > ScAnnontationsObj::mxComponent;
 
 ScAnnontationsObj::ScAnnontationsObj()
-       : UnoApiTest("/sc/qa/extras/testdocuments")
+       : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -82,7 +82,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init()
 void ScAnnontationsObj::setUp()
 {
     nTest++;
-    UnoApiTest::setUp();
+    CalcUnoApiTest::setUp();
 }
 
 void ScAnnontationsObj::tearDown()
@@ -90,7 +90,7 @@ void ScAnnontationsObj::tearDown()
     if (nTest == NUMBER_OF_TESTS)
         closeDocument(mxComponent);
 
-    UnoApiTest::tearDown();
+    CalcUnoApiTest::tearDown();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationsObj);