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

3 files changed, 43 insertions, 43 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 0a919c949755..fe25d8d866db 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -79,30 +79,30 @@ public:
     virtual                 ~EnhancedCustomShapeEngine();
 
     // XInterface
-    virtual void SAL_CALL   acquire() throw();
-    virtual void SAL_CALL   release() throw();
+    virtual void SAL_CALL   acquire() throw() SAL_OVERRIDE;
+    virtual void SAL_CALL   release() throw() SAL_OVERRIDE;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception );
+        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // XCustomShapeEngine
     virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::awt::Rectangle SAL_CALL getTextBounds()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction()
-        throw ( css::uno::RuntimeException, std::exception );
+        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
 EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 77574f25dd33..228e1d23d1c0 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -101,19 +101,19 @@ public:
         maValue( rValue )
     {
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         return maValue;
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return true;
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return FUNC_CONST;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         Fraction aFract( maValue );
@@ -150,20 +150,20 @@ public:
 
     {
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         OSL_TRACE("  $%d --> %f (angle: %f)", mnIndex, mrCustoShape.GetAdjustValueAsDouble( mnIndex ), 180.0*mrCustoShape.GetAdjustValueAsDouble( mnIndex )/10800000.0);
         return mrCustoShape.GetAdjustValueAsDouble( mnIndex );
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return false;
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return ENUM_FUNC_ADJUSTMENT;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
@@ -184,19 +184,19 @@ public:
         , mrCustoShape( rCustoShape )
     {
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         return mrCustoShape.GetEquationValueAsDouble( mnIndex );
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return false;
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return ENUM_FUNC_EQUATION;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -241,7 +241,7 @@ public:
         }
         return rCustoShape.GetEnumFunc( eF );
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
 #if OSL_DEBUG_LEVEL > 1
         const char *funcName;
@@ -268,15 +268,15 @@ public:
 
         return getValue( mrCustoShape, meFunct );
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return false;
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return meFunct;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
 
@@ -344,19 +344,19 @@ public:
         }
         return fRet;
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         return getValue( meFunct, mpArg );
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return mpArg->isConstant();
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return meFunct;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         switch( meFunct )
@@ -515,19 +515,19 @@ public:
         }
         return fRet;
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         return getValue( meFunct, mpFirstArg, mpSecondArg );
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return mpFirstArg->isConstant() && mpSecondArg->isConstant();
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return meFunct;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         switch( meFunct )
@@ -722,22 +722,22 @@ public:
         mpThirdArg(  rThirdArg )
     {
     }
-    virtual bool isConstant() const
+    virtual bool isConstant() const SAL_OVERRIDE
     {
         return
             mpFirstArg->isConstant() &&
             mpSecondArg->isConstant() &&
             mpThirdArg->isConstant();
     }
-    virtual double operator()() const
+    virtual double operator()() const SAL_OVERRIDE
     {
         return (*mpFirstArg)() > 0 ? (*mpSecondArg)() : (*mpThirdArg)();
     }
-    virtual ExpressionFunct getType() const
+    virtual ExpressionFunct getType() const SAL_OVERRIDE
     {
         return TERNARY_FUNC_IF;
     }
-    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
+    virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
     {
         EnhancedCustomShapeParameter aRet;
         aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 6e3401bb998b..3a2390600144 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -44,18 +44,18 @@ public:
     virtual ~EnhancedCustomShapeHandle();
 
     // XInterface
-    virtual void SAL_CALL acquire() throw();
-    virtual void SAL_CALL release() throw();
+    virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
+    virtual void SAL_CALL release() throw() SAL_OVERRIDE;
 
     // XCustomShapeHandle
     virtual com::sun::star::awt::Point SAL_CALL getPosition()
-        throw ( com::sun::star::uno::RuntimeException, std::exception );
+        throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual void SAL_CALL setControllerPosition( const com::sun::star::awt::Point& )
-        throw ( com::sun::star::uno::RuntimeException, std::exception );
+        throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // XInitialization
     virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
-        throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception );
+        throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
 #endif