Second batch of adding SAL_OVERRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

20 files changed, 70 insertions, 70 deletions

diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index b602931d98ce..36d6e1719015 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&);
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+    virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScAnnontationObj);
     CPPUNIT_TEST(testGetPosition);
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 190efe5164dd..ab8d142c46cb 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex);
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+    virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex) SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScAnnontationsObj);
     CPPUNIT_TEST(testInsertNew);
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 67b74052049d..91292bdddd28 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();
-    virtual void tearDown();
-    virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< uno::XInterface > getXCellRangeData();
+    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;
 
     CPPUNIT_TEST_SUITE(ScCellRangeObj);
     CPPUNIT_TEST(testQueryColumnDifference);
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index 3260d4d92553..9ed261b3af9b 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init( const OUString& rDBName );
+    virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) SAL_OVERRIDE;
 
     ScDatabaseRangeObj();
 
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index 1ba389a97655..da8957e198c5 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();
-    virtual void tearDown();
-    virtual uno::Reference< uno::XInterface > init();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
 
     ScDataPilotFieldObj();
 
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 74619ec86ed1..f5c1ebfbbcc2 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();
-    virtual void tearDown();
-    virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< uno::XInterface > initDP2();
-    virtual uno::Reference< uno::XInterface > getSheets();
+    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;
 
     CPPUNIT_TEST_SUITE(ScDataPilotTableObj);
     CPPUNIT_TEST(testRefresh);
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index fd1db19b4d4b..49a258399ea7 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();
-    virtual void tearDown();
-    virtual uno::Reference<uno::XInterface> init();
-    virtual uno::Reference<text::XTextContent> getTextContent();
-    virtual uno::Reference<text::XTextRange> getTextRange();
-    virtual bool isAttachSupported() { return true; }
+    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; }
 
     void testEditFieldProperties();
 
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index 11ff02f98b84..b596b8cad9f9 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();
-    virtual void tearDown();
-    virtual uno::Reference<uno::XInterface> init();
-    virtual uno::Reference<text::XTextContent> getTextContent();
-    virtual uno::Reference<text::XTextRange> getTextRange();
-    virtual bool isAttachSupported() { return false; }
+    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; }
 
     CPPUNIT_TEST_SUITE(ScEditFieldObj_Header);
 
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 701b289d1326..ef12e33bcfd9 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init();
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
 
     ScModelObj();
 
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index f3c485d8873a..cb17c6ccd2ae 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init();
-    virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName);
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
+    virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScNamedRangeObj);
     CPPUNIT_TEST(testGetContent);
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index 278240a5070a..f1a20c8087dd 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet);
+    virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) SAL_OVERRIDE;
 
     ScNamedRangesObj();
 
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index 0d6183eadcf6..476a2c0cfb28 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
-    virtual uno::Reference< uno::XInterface > init();
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScOutlineObj);
     CPPUNIT_TEST(testHideDetail);
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index 2dea47011a39..22d2cde920ff 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -26,7 +26,7 @@ class ScTableSheetObj : public CalcUnoApiTest, apitest::XSearchable, apitest::XR
 public:
     ScTableSheetObj();
 
-    virtual uno::Reference< uno::XInterface > init();
+    virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScTableSheetObj);
     CPPUNIT_TEST(testFindAll);
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 265f21d0505c..58c505ca74d8 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();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     CPPUNIT_TEST_SUITE(ScTableSheetsObj);
     CPPUNIT_TEST(testImportValue);
@@ -45,10 +45,10 @@ public:
     CPPUNIT_TEST(testRemoveByName);
     CPPUNIT_TEST_SUITE_END();
 
-    virtual uno::Reference< lang::XComponent > getComponent();
-    virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL);
-    virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString);
-    virtual uno::Reference< uno::XInterface > init();
+    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;
 protected:
     static uno::Reference< lang::XComponent > mxComponent;
     static sal_Int32 nTest;
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 9d049f7e87de..e556d537f120 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -47,12 +47,12 @@ class ScFiltersTest
 public:
     ScFiltersTest();
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     virtual bool load( const OUString &rFilter, const OUString &rURL,
         const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion);
+        unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
     /**
      * Ensure CVEs remain unbroken
      */
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 9def7e8bb24a..ae4cbf6a9992 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -60,12 +60,12 @@ public:
      */
     void enableOpenCL();
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     virtual bool load( const OUString &rFilter, const OUString &rURL,
             const OUString &rUserData, unsigned int nFilterFlags,
-            unsigned int nClipboardID, unsigned int nFilterVersion);
+            unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
     void testSharedFormulaXLS();
 #if 0
     void testSharedFormulaXLSGroundWater();
diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index afec0d1c84fa..7b6bd7967cbc 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -18,8 +18,8 @@
 class Test : public test::BootstrapFixture {
 
 public:
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     void testDeleteArea_4Ranges();
     void testDeleteArea_3Ranges();
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 45964fc1d7cd..50151e986402 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -56,8 +56,8 @@ class ScExportTest : public ScBootstrapFixture
 public:
     ScExportTest();
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const OUString&, const OUString&, sal_uLong );
 
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 92dfbaeeee60..7c974c827f60 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -79,10 +79,10 @@ public:
 
     virtual bool load( const OUString &rFilter, const OUString &rURL,
         const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion);
+        unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     //ods, xls, xlsx filter tests
     void testBasicCellContentODS();
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 9579918a2e8b..9cfcefcc7190 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -78,8 +78,8 @@ public:
 
     ScDocShell& getDocShell();
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
 
     /**
      * Basic performance regression test. Pick some actions that *should* take