summaryrefslogtreecommitdiff
path: root/svx/source/customshapes
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /svx/source/customshapes
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svx/source/customshapes')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx20
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx56
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeHandle.hxx10
3 files changed, 43 insertions, 43 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 803fdebb1fe0..34f408661bd9 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() SAL_OVERRIDE;
- virtual void SAL_CALL release() throw() SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XCustomShapeEngine
virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual css::awt::Rectangle SAL_CALL getTextBounds()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
};
EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 7108a59b75b4..736727675278 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -102,19 +102,19 @@ public:
maValue( rValue )
{
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
return maValue;
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return true;
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return FUNC_CONST;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ ) override
{
EnhancedCustomShapeParameter aRet;
Fraction aFract( maValue );
@@ -151,7 +151,7 @@ public:
{
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
SAL_INFO(
"svx",
@@ -161,15 +161,15 @@ public:
<< ")");
return mrCustoShape.GetAdjustValueAsDouble( mnIndex );
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return false;
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return ENUM_FUNC_ADJUSTMENT;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) override
{
EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
@@ -190,19 +190,19 @@ public:
, mrCustoShape( rCustoShape )
{
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
return mrCustoShape.GetEquationValueAsDouble( mnIndex );
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return false;
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return ENUM_FUNC_EQUATION;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) override
{
EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -247,7 +247,7 @@ public:
}
return rCustoShape.GetEnumFunc( eF );
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
#if OSL_DEBUG_LEVEL > 1
const char *funcName;
@@ -274,15 +274,15 @@ public:
return getValue( mrCustoShape, meFunct );
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return false;
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return meFunct;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) override
{
EnhancedCustomShapeParameter aRet;
@@ -350,19 +350,19 @@ public:
}
return fRet;
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
return getValue( meFunct, mpArg );
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return mpArg->isConstant();
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return meFunct;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) override
{
EnhancedCustomShapeParameter aRet;
switch( meFunct )
@@ -521,19 +521,19 @@ public:
}
return fRet;
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
return getValue( meFunct, mpFirstArg, mpSecondArg );
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return mpFirstArg->isConstant() && mpSecondArg->isConstant();
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return meFunct;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) override
{
EnhancedCustomShapeParameter aRet;
switch( meFunct )
@@ -728,22 +728,22 @@ public:
mpThirdArg( rThirdArg )
{
}
- virtual bool isConstant() const SAL_OVERRIDE
+ virtual bool isConstant() const override
{
return
mpFirstArg->isConstant() &&
mpSecondArg->isConstant() &&
mpThirdArg->isConstant();
}
- virtual double operator()() const SAL_OVERRIDE
+ virtual double operator()() const override
{
return (*mpFirstArg)() > 0 ? (*mpSecondArg)() : (*mpThirdArg)();
}
- virtual ExpressionFunct getType() const SAL_OVERRIDE
+ virtual ExpressionFunct getType() const override
{
return TERNARY_FUNC_IF;
}
- virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) SAL_OVERRIDE
+ virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags ) override
{
EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 37ad46dbf298..7e89e59fe3b6 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() SAL_OVERRIDE;
- virtual void SAL_CALL release() throw() SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
// XCustomShapeHandle
virtual com::sun::star::awt::Point SAL_CALL getPosition()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setControllerPosition( const com::sun::star::awt::Point& )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) override;
};
#endif