summaryrefslogtreecommitdiff
path: root/sc/qa/extras
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /sc/qa/extras
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/qa/extras')
-rw-r--r--sc/qa/extras/htmlexporttest.cxx4
-rw-r--r--sc/qa/extras/new_cond_format.cxx4
-rw-r--r--sc/qa/extras/scannotationobj.cxx8
-rw-r--r--sc/qa/extras/scannotationshapeobj.cxx8
-rw-r--r--sc/qa/extras/scannotationsobj.cxx8
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx8
-rw-r--r--sc/qa/extras/sccondformats.cxx4
-rw-r--r--sc/qa/extras/scdatabaserangeobj.cxx6
-rw-r--r--sc/qa/extras/scdatapilotfieldobj.cxx6
-rw-r--r--sc/qa/extras/scdatapilottableobj.cxx10
-rw-r--r--sc/qa/extras/sceditfieldobj-cell.cxx12
-rw-r--r--sc/qa/extras/sceditfieldobj-header.cxx12
-rw-r--r--sc/qa/extras/scmodelobj.cxx6
-rw-r--r--sc/qa/extras/scnamedrangeobj.cxx8
-rw-r--r--sc/qa/extras/scnamedrangesobj.cxx6
-rw-r--r--sc/qa/extras/scoutlineobj.cxx6
-rw-r--r--sc/qa/extras/scstyleloaderobj.cxx12
-rw-r--r--sc/qa/extras/sctablesheetobj.cxx6
-rw-r--r--sc/qa/extras/sctablesheetsobj.cxx12
19 files changed, 73 insertions, 73 deletions
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx
index 8dd0e8249df0..1151070b0e29 100644
--- a/sc/qa/extras/htmlexporttest.cxx
+++ b/sc/qa/extras/htmlexporttest.cxx
@@ -57,13 +57,13 @@ public:
ScHTMLExportTest()
{}
- virtual void setUp() SAL_OVERRIDE
+ virtual void setUp() override
{
test::BootstrapFixture::setUp();
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
}
- virtual void tearDown() SAL_OVERRIDE
+ virtual void tearDown() override
{
if (mxComponent.is())
mxComponent->dispose();
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx
index 375b23ad1f56..8dc111bacf5e 100644
--- a/sc/qa/extras/new_cond_format.cxx
+++ b/sc/qa/extras/new_cond_format.cxx
@@ -32,8 +32,8 @@ class ScConditionalFormatTest : public CalcUnoApiTest
public:
ScConditionalFormatTest();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
uno::Reference< uno::XInterface > init(sal_Int32 nIndex = 0);
void testRequestCondFormatListFromSheet();
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 8f2433912cb5..85316528b211 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -31,11 +31,11 @@ class ScAnnontationObj : public CalcUnoApiTest, apitest::XSheetAnnotation
public:
ScAnnontationObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) override;
CPPUNIT_TEST_SUITE(ScAnnontationObj);
CPPUNIT_TEST(testGetPosition);
diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx
index 07d3d80e368f..8f0c16e823fc 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -29,10 +29,10 @@ class ScAnnotationShapeObj : public CalcUnoApiTest, apitest::XText
public:
ScAnnotationShapeObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE;
- virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual uno::Reference<text::XTextContent> getTextContent() override;
CPPUNIT_TEST_SUITE(ScAnnotationShapeObj);
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index e011ac0eaf78..109c0654b08c 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -27,11 +27,11 @@ class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations
public:
ScAnnontationsObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex) SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex) override;
CPPUNIT_TEST_SUITE(ScAnnontationsObj);
CPPUNIT_TEST(testInsertNew);
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 058967618fbe..2757f6260269 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -31,10 +31,10 @@ class ScCellRangeObj : public CalcUnoApiTest, apitest::XCellRangesQuery, apitest
public:
ScCellRangeObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > getXCellRangeData() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< uno::XInterface > getXCellRangeData() override;
CPPUNIT_TEST_SUITE(ScCellRangeObj);
CPPUNIT_TEST(testQueryColumnDifference);
diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
index 4dd558bec98b..2868b8a11365 100644
--- a/sc/qa/extras/sccondformats.cxx
+++ b/sc/qa/extras/sccondformats.cxx
@@ -36,8 +36,8 @@ class ScConditionalFormatTest : public CalcUnoApiTest
public:
ScConditionalFormatTest();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
uno::Reference< uno::XInterface > init();
void testCondFormat();
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index a25b1ffe4eac..f6aca7abdf89 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -25,10 +25,10 @@ namespace sc_apitest {
class ScDatabaseRangeObj : public CalcUnoApiTest, apitest::XDatabaseRange
{
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) override;
ScDatabaseRangeObj();
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index cad8aa7297aa..d2d9bd0c2c23 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -28,9 +28,9 @@ class ScDataPilotFieldObj : public CalcUnoApiTest, apitest::XDataPilotFieldGroup
apitest::DataPilotField
{
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference< uno::XInterface > init() override;
ScDataPilotFieldObj();
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 9f4e0a03f711..a39a4c3635b8 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -32,11 +32,11 @@ class ScDataPilotTableObj : public CalcUnoApiTest, apitest::XDataPilotDescriptor
public:
ScDataPilotTableObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > initDP2() SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > getSheets() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< uno::XInterface > initDP2() override;
+ virtual uno::Reference< uno::XInterface > getSheets() override;
CPPUNIT_TEST_SUITE(ScDataPilotTableObj);
CPPUNIT_TEST(testRefresh);
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index 878210b7ab34..b16aaf6bc5e0 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -32,12 +32,12 @@ class ScEditFieldObj_Cell : public CalcUnoApiTest, apitest::XTextField, apitest:
public:
ScEditFieldObj_Cell();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE;
- virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE;
- virtual uno::Reference<text::XTextRange> getTextRange() SAL_OVERRIDE;
- virtual bool isAttachSupported() SAL_OVERRIDE { return true; }
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual uno::Reference<text::XTextContent> getTextContent() override;
+ virtual uno::Reference<text::XTextRange> getTextRange() override;
+ virtual bool isAttachSupported() override { return true; }
void testEditFieldProperties();
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index c72befda1dfd..d55663923dbf 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -35,12 +35,12 @@ class ScEditFieldObj_Header : public CalcUnoApiTest, apitest::XTextContent, apit
public:
ScEditFieldObj_Header();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
- virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE;
- virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE;
- virtual uno::Reference<text::XTextRange> getTextRange() SAL_OVERRIDE;
- virtual bool isAttachSupported() SAL_OVERRIDE { return false; }
+ virtual void setUp() override;
+ virtual void tearDown() override;
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual uno::Reference<text::XTextContent> getTextContent() override;
+ virtual uno::Reference<text::XTextRange> getTextRange() override;
+ virtual bool isAttachSupported() override { return false; }
CPPUNIT_TEST_SUITE(ScEditFieldObj_Header);
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index bb04af931bfe..dbddb106f532 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -20,10 +20,10 @@ namespace sc_apitest {
class ScModelObj : public UnoApiTest, apitest::XGoalSeek
{
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
ScModelObj();
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index da6e331ac1b8..20dfa517bb61 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -29,11 +29,11 @@ class ScNamedRangeObj : public CalcUnoApiTest, apitest::XNamedRange, apitest::XN
public:
ScNamedRangeObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) override;
CPPUNIT_TEST_SUITE(ScNamedRangeObj);
CPPUNIT_TEST(testGetContent);
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index d3eb0f379253..a5371e2c3654 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -24,10 +24,10 @@ namespace sc_apitest {
class ScNamedRangesObj : public CalcUnoApiTest, apitest::XNamedRanges
{
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) override;
ScNamedRangesObj();
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index cd27392d0346..b275a57f2676 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -25,10 +25,10 @@ class ScOutlineObj : public CalcUnoApiTest, apitest::XSheetOutline
public:
ScOutlineObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
CPPUNIT_TEST_SUITE(ScOutlineObj);
CPPUNIT_TEST(testHideDetail);
diff --git a/sc/qa/extras/scstyleloaderobj.cxx b/sc/qa/extras/scstyleloaderobj.cxx
index e79e445bba80..7e8d576bd2d8 100644
--- a/sc/qa/extras/scstyleloaderobj.cxx
+++ b/sc/qa/extras/scstyleloaderobj.cxx
@@ -25,13 +25,13 @@ class ScStyleLoaderObj : public CalcUnoApiTest, apitest::XStyleLoader
public:
ScStyleLoaderObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
- virtual uno::Reference< lang::XComponent > getTargetComponent() SAL_OVERRIDE;
- virtual uno::Reference< lang::XComponent > getSourceComponent() SAL_OVERRIDE;
- virtual OUString getTestURL() SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< lang::XComponent > getTargetComponent() override;
+ virtual uno::Reference< lang::XComponent > getSourceComponent() override;
+ virtual OUString getTestURL() override;
CPPUNIT_TEST_SUITE(ScStyleLoaderObj);
CPPUNIT_TEST(testLoadStylesFromURL);
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index fd9aa7671d06..f13efd2b845f 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -26,10 +26,10 @@ class ScTableSheetObj : public CalcUnoApiTest, apitest::XSearchable, apitest::XR
public:
ScTableSheetObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+ virtual uno::Reference< uno::XInterface > init() override;
CPPUNIT_TEST_SUITE(ScTableSheetObj);
CPPUNIT_TEST(testFindAll);
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 6fdeacebdc6f..a71192c462b1 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -26,8 +26,8 @@ class ScTableSheetsObj : public CalcUnoApiTest, public ::apitest::XSpreadsheets2
public:
ScTableSheetsObj();
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScTableSheetsObj);
CPPUNIT_TEST(testImportedSheetNameAndIndex);
@@ -43,10 +43,10 @@ public:
CPPUNIT_TEST(testRemoveByName);
CPPUNIT_TEST_SUITE_END();
- virtual uno::Reference< lang::XComponent > getComponent() SAL_OVERRIDE;
- virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL) SAL_OVERRIDE;
- virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString) SAL_OVERRIDE;
- virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+ virtual uno::Reference< lang::XComponent > getComponent() override;
+ virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL) override;
+ virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString) override;
+ virtual uno::Reference< uno::XInterface > init() override;
protected:
static uno::Reference< lang::XComponent > mxComponent;
static sal_Int32 nTest;