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, 50 insertions, 50 deletions

diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index 1d0c6cb6e0df..9080462d051d 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -31,9 +31,9 @@ public:
     ~CppuOptions() {}
 
     bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-            throw( IllegalArgument );
+            throw( IllegalArgument ) SAL_OVERRIDE;
 
-    OString  prepareHelp();
+    OString  prepareHelp() SAL_OVERRIDE;
 
     OString  prepareVersion();
 
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index eccb931e4aaa..06617bf86669 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1026,13 +1026,13 @@ public:
         rtl::Reference< unoidl::InterfaceTypeEntity > const & entity,
         OUString const & name, rtl::Reference< TypeManager > const & typeMgr);
 
-    virtual void dumpDeclaration(FileStream& o);
-    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    virtual void dumpDeclaration(FileStream& o) SAL_OVERRIDE;
+    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
     void        dumpAttributes(FileStream& o);
     void        dumpMethods(FileStream& o);
-    void        dumpNormalGetCppuType(FileStream& o);
-    void        dumpComprehensiveGetCppuType(FileStream& o);
+    void        dumpNormalGetCppuType(FileStream& o) SAL_OVERRIDE;
+    void        dumpComprehensiveGetCppuType(FileStream& o) SAL_OVERRIDE;
     void        dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index);
     void        dumpCppuMethodRefs(FileStream& o, sal_uInt32& index);
     void        dumpCppuAttributes(FileStream& o, sal_uInt32& index);
@@ -1042,9 +1042,9 @@ public:
 
 protected:
     virtual void addComprehensiveGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
-    virtual sal_uInt32 checkInheritedMemberCount() const
+    virtual sal_uInt32 checkInheritedMemberCount() const SAL_OVERRIDE
     { return BaseOffset(m_typeMgr, entity_).get(); }
 
     sal_uInt32  m_inheritedMemberCount;
@@ -1637,12 +1637,12 @@ public:
 
 private:
     virtual void dumpHFile(
-        FileStream & out, codemaker::cppumaker::Includes & includes);
+        FileStream & out, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
     virtual void dumpHxxFile(
-        FileStream & out, codemaker::cppumaker::Includes & includes);
+        FileStream & out, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    virtual void dumpDeclaration(FileStream & out);
+    virtual void dumpDeclaration(FileStream & out) SAL_OVERRIDE;
 
     rtl::Reference< unoidl::ConstantGroupEntity > entity_;
 };
@@ -1783,27 +1783,27 @@ public:
     { assert(entity.is()); }
 
 private:
-    virtual sal_uInt32 checkInheritedMemberCount() const
+    virtual sal_uInt32 checkInheritedMemberCount() const SAL_OVERRIDE
     { return getTotalMemberCount(entity_->getDirectBase()); }
 
-    virtual void dumpDeclaration(FileStream& o);
+    virtual void dumpDeclaration(FileStream& o) SAL_OVERRIDE;
 
-    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    virtual void dumpLightGetCppuType(FileStream & out);
+    virtual void dumpLightGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpNormalGetCppuType(FileStream & out);
+    virtual void dumpNormalGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpComprehensiveGetCppuType(FileStream & out);
+    virtual void dumpComprehensiveGetCppuType(FileStream & out) SAL_OVERRIDE;
 
     virtual void addLightGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
     virtual void addNormalGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
     virtual void addComprehensiveGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
     bool dumpBaseMembers(
         FileStream & out, OUString const & base, bool withType);
@@ -2165,30 +2165,30 @@ public:
     { assert(entity.is()); }
 
 private:
-    virtual void dumpDeclaration(FileStream& o);
+    virtual void dumpDeclaration(FileStream& o) SAL_OVERRIDE;
 
-    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    virtual void dumpLightGetCppuType(FileStream & out);
+    virtual void dumpLightGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpNormalGetCppuType(FileStream & out);
+    virtual void dumpNormalGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpComprehensiveGetCppuType(FileStream & out);
+    virtual void dumpComprehensiveGetCppuType(FileStream & out) SAL_OVERRIDE;
 
     virtual void addLightGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
     virtual void addNormalGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
     virtual void addComprehensiveGetCppuTypeIncludes(
-        codemaker::cppumaker::Includes & includes) const;
+        codemaker::cppumaker::Includes & includes) const SAL_OVERRIDE;
 
-    virtual bool isPolymorphic() const { return true; }
+    virtual bool isPolymorphic() const SAL_OVERRIDE { return true; }
 
-    virtual void dumpTemplateHead(FileStream & out) const;
+    virtual void dumpTemplateHead(FileStream & out) const SAL_OVERRIDE;
 
-    virtual void dumpTemplateParameters(FileStream & out) const;
+    virtual void dumpTemplateParameters(FileStream & out) const SAL_OVERRIDE;
 
     rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
 };
@@ -2663,18 +2663,18 @@ public:
 
 private:
     virtual void dumpHxxFile(
-        FileStream & out, codemaker::cppumaker::Includes & includes);
+        FileStream & out, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    virtual void dumpLightGetCppuType(FileStream & out);
+    virtual void dumpLightGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpNormalGetCppuType(FileStream & out);
+    virtual void dumpNormalGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual void dumpComprehensiveGetCppuType(FileStream & out);
+    virtual void dumpComprehensiveGetCppuType(FileStream & out) SAL_OVERRIDE;
 
-    virtual sal_uInt32 checkInheritedMemberCount() const
+    virtual sal_uInt32 checkInheritedMemberCount() const SAL_OVERRIDE
     { return getTotalMemberCount(entity_->getDirectBase()); }
 
-    virtual void dumpDeclaration(FileStream & out);
+    virtual void dumpDeclaration(FileStream & out) SAL_OVERRIDE;
 
     bool dumpBaseMembers(
         FileStream & out, OUString const & base, bool withType);
@@ -3078,12 +3078,12 @@ public:
     { assert(entity.is()); }
 
 private:
-    virtual void dumpDeclaration(FileStream& o);
+    virtual void dumpDeclaration(FileStream& o) SAL_OVERRIDE;
 
-    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    void        dumpNormalGetCppuType(FileStream& o);
-    void        dumpComprehensiveGetCppuType(FileStream& o);
+    void        dumpNormalGetCppuType(FileStream& o) SAL_OVERRIDE;
+    void        dumpComprehensiveGetCppuType(FileStream& o) SAL_OVERRIDE;
 
     rtl::Reference< unoidl::EnumTypeEntity > entity_;
 };
@@ -3236,11 +3236,11 @@ public:
     { assert(entity.is()); }
 
 private:
-    virtual void dumpDeclaration(FileStream& o);
+    virtual void dumpDeclaration(FileStream& o) SAL_OVERRIDE;
 
-    void dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    void dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
-    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes);
+    void dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
     rtl::Reference< unoidl::TypedefEntity > entity_;
 };
@@ -3295,10 +3295,10 @@ public:
         CppuType(name, manager) {}
 
 private:
-    virtual void dumpHFile(FileStream &, codemaker::cppumaker::Includes &)
+    virtual void dumpHFile(FileStream &, codemaker::cppumaker::Includes &) SAL_OVERRIDE
     { assert(false); } // this cannot happen
 
-    virtual void dumpFiles(OUString const & uri, CppuOptions const & options)
+    virtual void dumpFiles(OUString const & uri, CppuOptions const & options) SAL_OVERRIDE
     { dumpFile(uri, name_, true, options); }
 };
 
@@ -3336,7 +3336,7 @@ public:
 
 private:
     virtual void dumpHxxFile(
-        FileStream & o, codemaker::cppumaker::Includes & includes);
+        FileStream & o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
     void dumpCatchClauses(
         FileStream & out, codemaker::ExceptionTreeNode const * node);
@@ -3715,7 +3715,7 @@ public:
 
 private:
     virtual void dumpHxxFile(
-        FileStream & o, codemaker::cppumaker::Includes & includes);
+        FileStream & o, codemaker::cppumaker::Includes & includes) SAL_OVERRIDE;
 
     rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_;
 };
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index 62b05b1e66de..914d500c285d 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -31,9 +31,9 @@ public:
     ~JavaOptions() {}
 
     bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-            throw( IllegalArgument );
+            throw( IllegalArgument ) SAL_OVERRIDE;
 
-    OString  prepareHelp();
+    OString  prepareHelp() SAL_OVERRIDE;
 
     OString  prepareVersion();