diff options
| -rw-r--r-- | sc/CppunitTest_sc_filterdescriptorbase.mk (renamed from sc/CppunitTest_sc_filterdescriptorbaseobj.mk) | 22 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/qa/extras/scfilterdescriptorbase.cxx (renamed from sc/qa/extras/scfilterdescriptorbaseobj.cxx) | 40 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 1 |
4 files changed, 32 insertions, 33 deletions
diff --git a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk b/sc/CppunitTest_sc_filterdescriptorbase.mk index 2f67b429859c..4f0f206473cc 100644 --- a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk +++ b/sc/CppunitTest_sc_filterdescriptorbase.mk @@ -9,15 +9,15 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sc_filterdescriptorbaseobj)) +$(eval $(call gb_CppunitTest_CppunitTest,sc_filterdescriptorbase)) -$(eval $(call gb_CppunitTest_use_external,sc_filterdescriptorbaseobj,boost_headers)) +$(eval $(call gb_CppunitTest_use_external,sc_filterdescriptorbase,boost_headers)) -$(eval $(call gb_CppunitTest_add_exception_objects,sc_filterdescriptorbaseobj, \ - sc/qa/extras/scfilterdescriptorbaseobj\ +$(eval $(call gb_CppunitTest_add_exception_objects,sc_filterdescriptorbase, \ + sc/qa/extras/scfilterdescriptorbase\ )) -$(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbaseobj, \ +$(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbase, \ cppu \ sal \ subsequenttest \ @@ -25,19 +25,19 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbaseobj, \ unotest \ )) -$(eval $(call gb_CppunitTest_set_include,sc_filterdescriptorbaseobj,\ +$(eval $(call gb_CppunitTest_set_include,sc_filterdescriptorbase,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_filterdescriptorbaseobj)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_filterdescriptorbase)) -$(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbaseobj)) -$(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbaseobj)) +$(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbase)) +$(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbase)) -$(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbaseobj,\ +$(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbase,\ $(sc_unoapi_common_components) \ )) -$(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbaseobj)) +$(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbase)) # vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 75b10a4de667..dd41344970f5 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -135,7 +135,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_drawpagesobj \ CppunitTest_sc_editfieldobj_cell \ CppunitTest_sc_editfieldobj_header \ - CppunitTest_sc_filterdescriptorbaseobj \ + CppunitTest_sc_filterdescriptorbase \ CppunitTest_sc_functiondescriptionobj \ CppunitTest_sc_functionlistobj \ CppunitTest_sc_headerfieldsobj \ diff --git a/sc/qa/extras/scfilterdescriptorbaseobj.cxx b/sc/qa/extras/scfilterdescriptorbase.cxx index 5a0fd35ec5b3..be19bfc679f8 100644 --- a/sc/qa/extras/scfilterdescriptorbaseobj.cxx +++ b/sc/qa/extras/scfilterdescriptorbase.cxx @@ -21,21 +21,21 @@ using namespace css; using namespace css::uno; -namespace sc_apitest { - -class ScFilterDescriptorBaseObj : public CalcUnoApiTest, - public apitest::SheetFilterDescriptor, - public apitest::XSheetFilterDescriptor +namespace sc_apitest +{ +class ScFilterDescriptorBase : public CalcUnoApiTest, + public apitest::SheetFilterDescriptor, + public apitest::XSheetFilterDescriptor { public: - ScFilterDescriptorBaseObj(); + ScFilterDescriptorBase(); virtual void setUp() override; virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference<uno::XInterface> init() override; - CPPUNIT_TEST_SUITE(ScFilterDescriptorBaseObj); + CPPUNIT_TEST_SUITE(ScFilterDescriptorBase); // SheetFilterDescriptor CPPUNIT_TEST(testSheetFilterDescriptorProperties); @@ -46,46 +46,46 @@ public: CPPUNIT_TEST_SUITE_END(); private: - uno::Reference< lang::XComponent > mxComponent; + uno::Reference<lang::XComponent> mxComponent; }; -ScFilterDescriptorBaseObj::ScFilterDescriptorBaseObj(): - CalcUnoApiTest("/sc/qa/extras/testdocuments") +ScFilterDescriptorBase::ScFilterDescriptorBase() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") { } -uno::Reference< uno::XInterface > ScFilterDescriptorBaseObj::init() +uno::Reference<uno::XInterface> ScFilterDescriptorBase::init() { - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); - uno::Reference< container::XIndexAccess > xIndexAccess(xDoc->getSheets(), uno::UNO_QUERY_THROW); - uno::Reference< sheet::XSpreadsheet > xSheet(xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIndexAccess(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet(xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW); xSheet->getCellByPosition(5, 5)->setValue(15); xSheet->getCellByPosition(1, 4)->setValue(10); xSheet->getCellByPosition(2, 0)->setValue(-5.15); - uno::Reference< sheet::XSheetFilterable > xSF(xSheet, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSheetFilterable> xSF(xSheet, uno::UNO_QUERY_THROW); return xSF->createFilterDescriptor(true); } -void ScFilterDescriptorBaseObj::setUp() +void ScFilterDescriptorBase::setUp() { CalcUnoApiTest::setUp(); // create a calc document mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScFilterDescriptorBaseObj::tearDown() +void ScFilterDescriptorBase::tearDown() { closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } -CPPUNIT_TEST_SUITE_REGISTRATION(ScFilterDescriptorBaseObj); +CPPUNIT_TEST_SUITE_REGISTRATION(ScFilterDescriptorBase); -} +} // namespace sc_apitest CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index fe3dc1f27f6a..259dec773128 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -10142,7 +10142,6 @@ sc/qa/extras/scdatapilotitemobj.cxx sc/qa/extras/scdatapilottableobj.cxx sc/qa/extras/sceditfieldobj-cell.cxx sc/qa/extras/sceditfieldobj-header.cxx -sc/qa/extras/scfilterdescriptorbaseobj.cxx sc/qa/extras/scmodelobj.cxx sc/qa/extras/scnamedrangeobj.cxx sc/qa/extras/scoutlineobj.cxx |