From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 12 Oct 2015 16:04:04 +0200
Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
---
 l10ntools/inc/cfgmerge.hxx | 12 ++++++------
 l10ntools/inc/xmlparse.hxx | 10 +++++-----
 l10ntools/inc/xrmmerge.hxx | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'l10ntools')

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index c2342b5c12cf..355f4c5c52e5 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -141,10 +141,10 @@ protected:
     virtual void WorkOnText(
         OString &rText,
         const OString &rIsoLang
-        ) SAL_OVERRIDE;
+        ) override;
 
-    void WorkOnResourceEnd() SAL_OVERRIDE;
-    void Output(const OString& rOutput) SAL_OVERRIDE;
+    void WorkOnResourceEnd() override;
+    void Output(const OString& rOutput) override;
 public:
     CfgExport(
         const OString &rOutputFile,
@@ -167,11 +167,11 @@ private:
     std::ofstream pOutputStream;
 
 protected:
-    virtual void WorkOnText(OString &rText, const OString &rLangIndex) SAL_OVERRIDE;
+    virtual void WorkOnText(OString &rText, const OString &rLangIndex) override;
 
-    void WorkOnResourceEnd() SAL_OVERRIDE;
+    void WorkOnResourceEnd() override;
 
-    void Output(const OString& rOutput) SAL_OVERRIDE;
+    void Output(const OString& rOutput) override;
 public:
     CfgMerge(
         const OString &rMergeSource, const OString &rOutputFile,
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 8b94d31648db..70d83fd925ec 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 SAL_OVERRIDE { return XML_NODE_TYPE_FILE; }
+    virtual sal_uInt16 GetNodeType() const 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 SAL_OVERRIDE { return XML_NODE_TYPE_ELEMENT; }
+    virtual sal_uInt16 GetNodeType() const override { return XML_NODE_TYPE_ELEMENT; }
 
     /// returns element name
     OString GetName() const { return m_sElementName; }
@@ -265,7 +265,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_DATA; }
+    virtual sal_uInt16 GetNodeType() const override { return XML_NODE_TYPE_DATA; }
 
     /// returns the data
     OString GetData() const { return m_sData; }
@@ -291,7 +291,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_COMMENT; }
+    virtual sal_uInt16 GetNodeType() const override { return XML_NODE_TYPE_COMMENT; }
 
     /// returns the comment
     OString GetComment() const { return m_sComment; }
@@ -314,7 +314,7 @@ public:
 
     // Default copy constructor and copy operator work well.
 
-    virtual sal_uInt16 GetNodeType() const SAL_OVERRIDE { return XML_NODE_TYPE_DEFAULT; }
+    virtual sal_uInt16 GetNodeType() const 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 c3820b4ec6b5..fc58aa6998ff 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -79,16 +79,16 @@ protected:
     void WorkOnDesc(
         const OString &rOpenTag,
         OString &rText
-    ) SAL_OVERRIDE;
+    ) override;
     void WorkOnText(
         const OString &rOpenTag,
         OString &rText
-    ) SAL_OVERRIDE;
+    ) override;
     void EndOfText(
         const OString &rOpenTag,
         const OString &rCloseTag
-    ) SAL_OVERRIDE;
-    void Output( const OString& rOutput ) SAL_OVERRIDE;
+    ) override;
+    void Output( const OString& rOutput ) override;
 
 public:
     XRMResExport(
@@ -113,16 +113,16 @@ protected:
     void WorkOnDesc(
         const OString &rOpenTag,
         OString &rText
-    ) SAL_OVERRIDE;
+    ) override;
     void WorkOnText(
         const OString &rOpenTag,
         OString &rText
-    ) SAL_OVERRIDE;
+    ) override;
     void EndOfText(
         const OString &rOpenTag,
         const OString &rCloseTag
-    ) SAL_OVERRIDE;
-    void Output( const OString& rOutput ) SAL_OVERRIDE;
+    ) override;
+    void Output( const OString& rOutput ) override;
 public:
     XRMResMerge(
         const OString &rMergeSource,
-- 
cgit