[Libreoffice-commits] core.git: sc/CppunitTest_sc_tableconditionalformat.mk sc/CppunitTest_sc_tableconditionalformatobj.mk sc/Module_sc.mk sc/qa

[Libreoffice Gerrit user]

 sc/CppunitTest_sc_tableconditionalformat.mk |   22 +++++++++++-----------
 sc/Module_sc.mk                             |    2 +-
 sc/qa/extras/sctableconditionalformat.cxx   |   24 ++++++++++++------------
 3 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 1ffde9252f4583264a1f90449b9ea7cf83c2e9d9
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Wed Jan 16 20:59:36 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Jan 16 23:50:30 2019 +0100

    Rename ScTableConditionalFormatObj to ScTableConditionalFormat
    
    Rename ScTableConditionalFormatObj to ScTableConditionalFormat to match
    the object name to test against.
    
    Change-Id: Ic14bc1181a6c0724e0973955119d9f2e731d0940
    Reviewed-on: https://gerrit.libreoffice.org/66484
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/sc/CppunitTest_sc_tableconditionalformatobj.mk b/sc/CppunitTest_sc_tableconditionalformat.mk
similarity index 80%
rename from sc/CppunitTest_sc_tableconditionalformatobj.mk
rename to sc/CppunitTest_sc_tableconditionalformat.mk
index 07e53f82b787..7809cd1e5179 100644
--- a/sc/CppunitTest_sc_tableconditionalformatobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalformat.mk
@@ -9,15 +9,15 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_tableconditionalformatobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_tableconditionalformat))
 
-$(eval $(call gb_CppunitTest_use_external,sc_tableconditionalformatobj,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,sc_tableconditionalformat,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_tableconditionalformatobj, \
-	sc/qa/extras/sctableconditionalformatobj \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_tableconditionalformat, \
+	sc/qa/extras/sctableconditionalformat \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sc_tableconditionalformatobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_tableconditionalformat, \
 	cppu \
 	sal \
 	subsequenttest \
@@ -25,20 +25,20 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableconditionalformatobj, \
 	unotest \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sc_tableconditionalformatobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_tableconditionalformat,\
 	-I$(SRCDIR)/sc/inc \
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_tableconditionalformatobj))
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_tableconditionalformat))
 
-$(eval $(call gb_CppunitTest_use_ure,sc_tableconditionalformatobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_tableconditionalformatobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_tableconditionalformat))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tableconditionalformat))
 
-$(eval $(call gb_CppunitTest_use_components,sc_tableconditionalformatobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_tableconditionalformat,\
 	$(sc_unoapi_common_components) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_tableconditionalformatobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_tableconditionalformat))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6ee193103f70..761511caca05 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -181,7 +181,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 	CppunitTest_sc_subtotaldescriptorbaseobj \
 	CppunitTest_sc_subtotalfieldobj \
 	CppunitTest_sc_tableconditionalentryobj \
-	CppunitTest_sc_tableconditionalformatobj \
+	CppunitTest_sc_tableconditionalformat \
 	CppunitTest_sc_tablerowsobj \
 	CppunitTest_sc_tablesheetobj \
 	CppunitTest_sc_tablesheetsobj \
diff --git a/sc/qa/extras/sctableconditionalformatobj.cxx b/sc/qa/extras/sctableconditionalformat.cxx
similarity index 84%
rename from sc/qa/extras/sctableconditionalformatobj.cxx
rename to sc/qa/extras/sctableconditionalformat.cxx
index adb0ae023820..d19ceccce756 100644
--- a/sc/qa/extras/sctableconditionalformatobj.cxx
+++ b/sc/qa/extras/sctableconditionalformat.cxx
@@ -35,19 +35,19 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScTableConditionalFormatObj : public CalcUnoApiTest,
-                                    public apitest::XEnumerationAccess,
-                                    public apitest::XSheetConditionalEntries
+class ScTableConditionalFormat : public CalcUnoApiTest,
+                                 public apitest::XEnumerationAccess,
+                                 public apitest::XSheetConditionalEntries
 {
 public:
-    ScTableConditionalFormatObj();
+    ScTableConditionalFormat();
 
     virtual uno::Reference<uno::XInterface> init() override;
     virtual uno::Sequence<beans::PropertyValue> createCondition(const sal_Int32 nr) override;
     virtual void setUp() override;
     virtual void tearDown() override;
 
-    CPPUNIT_TEST_SUITE(ScTableConditionalFormatObj);
+    CPPUNIT_TEST_SUITE(ScTableConditionalFormat);
 
     // XEnumerationAccess
     CPPUNIT_TEST(testCreateEnumeration);
@@ -63,12 +63,12 @@ private:
     uno::Reference<lang::XComponent> mxComponent;
 };
 
-ScTableConditionalFormatObj::ScTableConditionalFormatObj()
+ScTableConditionalFormat::ScTableConditionalFormat()
     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
-uno::Reference<uno::XInterface> ScTableConditionalFormatObj::init()
+uno::Reference<uno::XInterface> ScTableConditionalFormat::init()
 {
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
@@ -90,7 +90,7 @@ uno::Reference<uno::XInterface> ScTableConditionalFormatObj::init()
     return xSheetConditionalEntries;
 }
 
-uno::Sequence<beans::PropertyValue> ScTableConditionalFormatObj::createCondition(const sal_Int32 nr)
+uno::Sequence<beans::PropertyValue> ScTableConditionalFormat::createCondition(const sal_Int32 nr)
 {
     uno::Sequence<beans::PropertyValue> aPropValue(5);
     aPropValue[0].Name = SC_UNONAME_STYLENAME;
@@ -107,22 +107,22 @@ uno::Sequence<beans::PropertyValue> ScTableConditionalFormatObj::createCondition
     return aPropValue;
 }
 
-void ScTableConditionalFormatObj::setUp()
+void ScTableConditionalFormat::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
-void ScTableConditionalFormatObj::tearDown()
+void ScTableConditionalFormat::tearDown()
 {
     closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ScTableConditionalFormatObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScTableConditionalFormat);
 
-} // end namespace
+} // namespace sc_apitest
 
 CPPUNIT_PLUGIN_IMPLEMENT();