First batch of adding SAL_OVERRRIDE to overriding function declarations

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

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a

3 files changed, 19 insertions, 19 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 491ebc959b41..55a1670f6c94 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -142,10 +142,10 @@ protected:
     virtual void WorkOnText(
         OString &rText,
         const OString &rIsoLang
-        );
+        ) SAL_OVERRIDE;
 
-    void WorkOnResourceEnd();
-    void Output(const OString& rOutput);
+    void WorkOnResourceEnd() SAL_OVERRIDE;
+    void Output(const OString& rOutput) SAL_OVERRIDE;
 public:
     CfgExport(
         const OString &rOutputFile,
@@ -168,11 +168,11 @@ private:
     std::ofstream pOutputStream;
 
 protected:
-    virtual void WorkOnText(OString &rText, const OString &rLangIndex);
+    virtual void WorkOnText(OString &rText, const OString &rLangIndex) SAL_OVERRIDE;
 
-    void WorkOnResourceEnd();
+    void WorkOnResourceEnd() SAL_OVERRIDE;
 
-    void Output(const OString& rOutput);
+    void Output(const OString& rOutput) SAL_OVERRIDE;
 public:
     CfgMerge(
         const OString &rMergeSource, const OString &rOutputFile,
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index b3d332a1de60..6db78a5ab07b 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -166,7 +166,7 @@ public:
 
     XMLFile& operator=(const XMLFile& rObj);
 
-    virtual sal_uInt16 GetNodeType() const { return XML_NODE_TYPE_FILE; }
+    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_FILE; }
 
     /// returns file name
     OString GetName() const { return m_sFileName; }
@@ -224,7 +224,7 @@ public:
     XMLElement(const XMLElement&);
 
     XMLElement& operator=(const XMLElement& rObj);
-    virtual sal_uInt16 GetNodeType() const { return XML_NODE_TYPE_ELEMENT; }
+    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_ELEMENT; }
 
     /// returns element name
     OString GetName() const { return m_sElementName; }
@@ -278,7 +278,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const { return XML_NODE_TYPE_DATA; }
+    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_DATA; }
 
     /// returns the data
     OString GetData() const { return m_sData; }
@@ -306,7 +306,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const { return XML_NODE_TYPE_COMMENT; }
+    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_COMMENT; }
 
     /// returns the comment
     OString GetComment() const { return m_sComment; }
@@ -329,7 +329,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const { return XML_NODE_TYPE_DEFAULT; }
+    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_DEFAULT; }
 
     /// returns the comment
     OString GetDefault() const { return m_sDefault; }
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index c3eb7426ab40..96997f0cab35 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -81,16 +81,16 @@ protected:
     void WorkOnDesc(
         const OString &rOpenTag,
         OString &rText
-    );
+    ) SAL_OVERRIDE;
     void WorkOnText(
         const OString &rOpenTag,
         OString &rText
-    );
+    ) SAL_OVERRIDE;
     void EndOfText(
         const OString &rOpenTag,
         const OString &rCloseTag
-    );
-    void Output( const OString& rOutput );
+    ) SAL_OVERRIDE;
+    void Output( const OString& rOutput ) SAL_OVERRIDE;
 
 public:
     XRMResExport(
@@ -115,16 +115,16 @@ protected:
     void WorkOnDesc(
         const OString &rOpenTag,
         OString &rText
-    );
+    ) SAL_OVERRIDE;
     void WorkOnText(
         const OString &rOpenTag,
         OString &rText
-    );
+    ) SAL_OVERRIDE;
     void EndOfText(
         const OString &rOpenTag,
         const OString &rCloseTag
-    );
-    void Output( const OString& rOutput );
+    ) SAL_OVERRIDE;
+    void Output( const OString& rOutput ) SAL_OVERRIDE;
 public:
     XRMResMerge(
         const OString &rMergeSource,