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

1 files changed, 153 insertions, 153 deletions

diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx
index a8d3d7f892c9..51a0379eed18 100644
--- a/sc/source/core/opencl/op_math.hxx
+++ b/sc/source/core/opencl/op_math.hxx
@@ -18,33 +18,33 @@ class OpCos: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Cos"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cos"; }
 };
 class OpSec: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Sec"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sec"; }
 };
 class OpSecH: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "SecH"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SecH"; }
 };
 class OpMROUND: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "MROUND"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; }
 };
 
 
@@ -52,16 +52,16 @@ class OpCsc: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Csc"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Csc"; }
 };
 class OpSumIfs: public CheckVariables
 {
 public:
     OpSumIfs(void): CheckVariables(), mNeedReductionKernel(false) {}
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "SumIfs"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIfs"; }
     bool NeedReductionKernel(void) const { return mNeedReductionKernel; }
 protected:
     bool mNeedReductionKernel;
@@ -70,429 +70,429 @@ class OpCosh: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& );
-    virtual std::string BinFuncName(void) const { return "Cosh"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cosh"; }
 };
 class OpSinh: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Sinh"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sinh"; }
 };
 class OpSin: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Sin"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sin"; }
 };
 class OpAbs:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScAbs"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScAbs"; }
 };
 class OpArcCos:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScACos"; }
-    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&);
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACos"; }
+    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE;
 };
 class OpArcCosHyp:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "1.0"; }
-    virtual std::string BinFuncName(void) const { return "ScACosH"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACosH"; }
 };
 class OpTan: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Tan"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Tan"; }
 };
 class OpTanH: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "TanH"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TanH"; }
 };
 class OpSqrt: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Sqrt"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sqrt"; }
 };
 class OpArcCot:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScACot"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACot"; }
 };
 class OpArcCotHyp:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "2.0"; }
-    virtual std::string BinFuncName(void) const { return "ScACotH"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "2.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACotH"; }
 };
 class OpArcSin:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScASin"; }
-    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&);
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASin"; }
+    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE;
 };
 class OpArcSinHyp:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScASinH"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASinH"; }
 };
 class OpTrunc: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Trunc"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Trunc"; }
 };
 class OpArcTan2:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScATan2"; }
-    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&);
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan2"; }
+    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE;
 };
 class OpArcTan:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScATan"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan"; }
 };
 class OpArcTanH:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScATanH"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATanH"; }
 };
 class OpBitAnd:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-        virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScBitAnd"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+        virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitAnd"; }
 };
 class OpBitOr:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScBitOr"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitOr"; }
 };
 class OpBitXor:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScBitXor"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitXor"; }
 };
 class OpBitLshift:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScBitLshift"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitLshift"; }
 };
 class OpBitRshift:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScBitRshift"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitRshift"; }
 };
 class OpLn: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Ln"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Ln"; }
 };
 class OpRound: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Round"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Round"; }
 };
 class OpRoundUp: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "RoundUp"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundUp"; }
 };
 class OpRoundDown: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "RoundDown"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundDown"; }
 };
 class OpInt: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Int"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Int"; }
 };
 class OpRadians: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Radians"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Radians"; }
 };
 class OpIsEven: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "IsEven"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsEven"; }
 };
 class OpIsOdd: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "IsOdd"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsOdd"; }
 };
 class OpCot: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Cot"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cot"; }
 };
 class OpSumSQ: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "SumSQ"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumSQ"; }
 };
 class OpCoth: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
     virtual void BinInlineFun(std::set<std::string>& ,
-            std::set<std::string>& );
-    virtual std::string BinFuncName(void) const { return "Coth"; }
+            std::set<std::string>& ) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coth"; }
 };
 class OpPower: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Power"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Power"; }
 };
 class OpOdd: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Odd"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Odd"; }
 };
 class OpFloor: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Floor"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Floor"; }
 };
 class OpCscH: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "CscH"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CscH"; }
 };
 class OpCeil:public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScCeil"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCeil"; }
 };
 class OpExp: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Exp"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Exp"; }
 };
 class OpLog10: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Log10"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log10"; }
 };
 class OpConvert: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Convert"; }
-    virtual bool takeString() const { return true; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Convert"; }
+    virtual bool takeString() const SAL_OVERRIDE { return true; }
 
 };
 class OpEven: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Even"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Even"; }
 };
 class OpAverageIfs: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "AverageIfs"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIfs"; }
 };
 class OpCountIfs: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "CountIfs"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CountIfs"; }
 };
 class OpMod: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Mod"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Mod"; }
 };
 class OpProduct: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Product"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Product"; }
 };
 class OpSqrtPi: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "SqrtPi"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; }
 };
 
 class OpCombina: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Combina"; }
-    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& );
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Combina"; }
+    virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE;
 };
 class OpLog: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "Log"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; }
 };
 class OpKombin: public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "ScKombin"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScKombin"; }
 };
 class OpAverageIf: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
 
-    virtual std::string BinFuncName(void) const { return "AverageIf"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIf"; }
 };
 class OpDeg: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Degrees"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Degrees"; }
 };
 class OpCountIf: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Countif"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Countif"; }
 };
 class OpFact: public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream& ss,
-        const std::string &sSymName, SubArguments& vSubArguments);
-    virtual std::string GetBottom(void) { return "0.0"; }
-    virtual std::string BinFuncName(void) const { return "Fact"; }
+        const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE;
+    virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fact"; }
 };
 class OpSeriesSum: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "SeriesSum"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SeriesSum"; }
 };
 class OpSumIf: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "SumIf"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIf"; }
 };
 class OpQuotient: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-        const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "Quotient"; }
+        const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Quotient"; }
 };
 class OpNegSub: public CheckVariables
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
-            const std::string &sSymName, SubArguments &vSubArguments);
-    virtual std::string BinFuncName(void) const { return "NegSub"; }
+            const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NegSub"; }
 };
 
 }}