sc/CppunitTest_sc_spreadsheetsettings.mk | 22 +++++++++++-----------
sc/Module_sc.mk | 2 +-
sc/qa/extras/scspreadsheetsettings.cxx | 16 ++++++++--------
3 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit fd911a32505331174787403e6260202e29ea82b8
Author: Jens Carl <j.car...@gmx.de>
Date: Thu Mar 22 05:46:16 2018 +0000
tdf#45904 Rename test object for GlobalSheetSettings
Rename test object ScSpreadsheetSettingsObj to ScSpreadsheetSettings.
Change-Id: Ia70cc82e0ee20571ad029590db735f932e5c7958
Reviewed-on: https://gerrit.libreoffice.org/51723
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
b/sc/CppunitTest_sc_spreadsheetsettings.mk
similarity index 73%
rename from sc/CppunitTest_sc_spreadsheetsettingsobj.mk
rename to sc/CppunitTest_sc_spreadsheetsettings.mk
index f39201002bb3..908f2a530c2e 100644
--- a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
+++ b/sc/CppunitTest_sc_spreadsheetsettings.mk
@@ -9,15 +9,15 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_spreadsheetsettingsobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_spreadsheetsettings))
-$(eval $(call
gb_CppunitTest_use_external,sc_spreadsheetsettingsobj,boost_headers))
+$(eval $(call
gb_CppunitTest_use_external,sc_spreadsheetsettings,boost_headers))
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsettingsobj, \
- sc/qa/extras/scspreadsheetsettingsobj \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsettings, \
+ sc/qa/extras/scspreadsheetsettings \
))
-$(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettingsobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettings, \
basegfx \
comphelper \
cppu \
@@ -52,21 +52,21 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_spreadsheetsettingsobj, \
xo \
))
-$(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsettingsobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsettings,\
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_spreadsheetsettingsobj))
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_spreadsheetsettings))
-$(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsettingsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_spreadsheetsettingsobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsettings))
+$(eval $(call gb_CppunitTest_use_vcl,sc_spreadsheetsettings))
-$(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettingsobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettings,\
$(sc_unoapi_common_components) \
))
-$(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsettingsobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsettings))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index eaecad60104e..6e3a5090d71b 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -153,7 +153,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_autoformatobj \
CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_documentconfigurationobj \
- CppunitTest_sc_spreadsheetsettingsobj \
+ CppunitTest_sc_spreadsheetsettings \
CppunitTest_sc_shapeobj \
CppunitTest_sc_sheetlinkobj \
))
diff --git a/sc/qa/extras/scspreadsheetsettingsobj.cxx
b/sc/qa/extras/scspreadsheetsettings.cxx
similarity index 80%
rename from sc/qa/extras/scspreadsheetsettingsobj.cxx
rename to sc/qa/extras/scspreadsheetsettings.cxx
index 34edd4cc916f..48dfb48beb16 100644
--- a/sc/qa/extras/scspreadsheetsettingsobj.cxx
+++ b/sc/qa/extras/scspreadsheetsettings.cxx
@@ -23,16 +23,16 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScSpreadsheetSettingsObj : public CalcUnoApiTest, public
apitest::GlobalSheetSettings
+class ScSpreadsheetSettings : public CalcUnoApiTest, public
apitest::GlobalSheetSettings
{
public:
- ScSpreadsheetSettingsObj();
+ ScSpreadsheetSettings();
virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override;
virtual void tearDown() override;
- CPPUNIT_TEST_SUITE(ScSpreadsheetSettingsObj);
+ CPPUNIT_TEST_SUITE(ScSpreadsheetSettings);
// GlobalSheetSettings
CPPUNIT_TEST(testGlobalSheetSettingsProperties);
@@ -43,12 +43,12 @@ private:
uno::Reference<lang::XComponent> mxComponent;
};
-ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj()
+ScSpreadsheetSettings::ScSpreadsheetSettings()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
-uno::Reference<uno::XInterface> ScSpreadsheetSettingsObj::init()
+uno::Reference<uno::XInterface> ScSpreadsheetSettings::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
@@ -57,20 +57,20 @@ uno::Reference<uno::XInterface>
ScSpreadsheetSettingsObj::init()
return xMSF->createInstance("com.sun.star.sheet.GlobalSheetSettings");
}
-void ScSpreadsheetSettingsObj::setUp()
+void ScSpreadsheetSettings::setUp()
{
CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
}
-void ScSpreadsheetSettingsObj::tearDown()
+void ScSpreadsheetSettings::tearDown()
{
closeDocument(mxComponent);
CalcUnoApiTest::tearDown();
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettingsObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettings);
} // end namespace
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
