summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-20 07:27:20 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-20 08:37:20 +0200
commitcc2fe8c763b7050f07968f31bcdb7e45b8c7464d (patch)
tree499b8644a21d45f1317cfb9fc891e2f6d683802b /sc/source/ui
parent475ea37809b5bec369d02a5ab500fac46ab40f0a (diff)
Replace SAL_OVERRIDE with override in internal code
Change-Id: Ifa446647b11fd1f1b0dc6a991b752480545634db Reviewed-on: https://gerrit.libreoffice.org/60788 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/vba/vbacondition.hxx6
-rw-r--r--sc/source/ui/vba/vbapagebreak.hxx8
-rw-r--r--sc/source/ui/vba/vbatitle.hxx24
3 files changed, 19 insertions, 19 deletions
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index bedd0424f161..7757eb5d06b5 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -36,13 +36,13 @@ public:
/// @throws css::script::BasicErrorException
static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator);
- virtual OUString SAL_CALL Formula1( ) SAL_OVERRIDE;
- virtual OUString SAL_CALL Formula2( ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL Formula1( ) override;
+ virtual OUString SAL_CALL Formula2( ) override;
/// @throws css::script::BasicErrorException
virtual void setFormula1( const css::uno::Any& _aFormula1);
/// @throws css::script::BasicErrorException
virtual sal_Int32 Operator(bool _bIncludeFormulaValue);
- virtual sal_Int32 SAL_CALL Operator() SAL_OVERRIDE = 0;
+ virtual sal_Int32 SAL_CALL Operator() override = 0;
};
#endif
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 4d6f847a0491..c85fd303db0e 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -42,11 +42,11 @@ public:
css::uno::Reference< css::beans::XPropertySet >& xProps,
css::sheet::TablePageBreakData aTablePageBreakData);
- virtual sal_Int32 SAL_CALL getType( ) SAL_OVERRIDE;
- virtual void SAL_CALL setType(sal_Int32 type) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getType( ) override;
+ virtual void SAL_CALL setType(sal_Int32 type) override;
- virtual void SAL_CALL Delete() SAL_OVERRIDE;
- virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() SAL_OVERRIDE;
+ virtual void SAL_CALL Delete() override;
+ virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() override;
};
typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE;
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index 06078ef66f55..228c57553c72 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -50,7 +50,7 @@ public:
xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW );
oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) );
}
- css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) SAL_OVERRIDE
+ css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) override
{
// #TODO find out what the proper parent should be
// leaving as set by the helperapi for the moment
@@ -58,14 +58,14 @@ public:
// otherwise attempts to access the palette will fail
return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet );
}
- css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) SAL_OVERRIDE
+ css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) override
{
// #TODO find out what the proper parent should be
// leaving as set by the helperapi for the moment
return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet );
}
- void SAL_CALL setText( const OUString& Text ) SAL_OVERRIDE
+ void SAL_CALL setText( const OUString& Text ) override
{
try
{
@@ -76,7 +76,7 @@ public:
throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
- OUString SAL_CALL getText( ) SAL_OVERRIDE
+ OUString SAL_CALL getText( ) override
{
OUString sText;
try
@@ -90,23 +90,23 @@ public:
return sText;
}
- void SAL_CALL setTop( double Top ) SAL_OVERRIDE
+ void SAL_CALL setTop( double Top ) override
{
oShapeHelper->setTop( Top );
}
- double SAL_CALL getTop( ) SAL_OVERRIDE
+ double SAL_CALL getTop( ) override
{
return oShapeHelper->getTop();
}
- void SAL_CALL setLeft( double Left ) SAL_OVERRIDE
+ void SAL_CALL setLeft( double Left ) override
{
oShapeHelper->setLeft( Left );
}
- double SAL_CALL getLeft( ) SAL_OVERRIDE
+ double SAL_CALL getLeft( ) override
{
return oShapeHelper->getLeft();
}
- void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) SAL_OVERRIDE
+ void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) override
{
try
{
@@ -117,7 +117,7 @@ public:
throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
- ::sal_Int32 SAL_CALL getOrientation( ) SAL_OVERRIDE
+ ::sal_Int32 SAL_CALL getOrientation( ) override
{
sal_Int32 nSOOrientation = 0;
try
@@ -131,11 +131,11 @@ public:
return static_cast< sal_Int32 >(nSOOrientation / 100) ;
}
// XHelperInterface
- OUString getServiceImplName() SAL_OVERRIDE
+ OUString getServiceImplName() override
{
return OUString("TitleImpl");
}
- css::uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE
+ css::uno::Sequence< OUString > getServiceNames() override
{
static css::uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )