summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba/vbaborders.cxx
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 /sc/source/ui/vba/vbaborders.cxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/source/ui/vba/vbaborders.cxx')
-rw-r--r--sc/source/ui/vba/vbaborders.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 7f94c6b80072..a001908e2029 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -143,11 +143,11 @@ private:
}
protected:
- virtual OUString getServiceImplName() SAL_OVERRIDE
+ virtual OUString getServiceImplName() override
{
return OUString("ScVbaBorder");
}
- virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE
+ virtual css::uno::Sequence<OUString> getServiceNames() override
{
static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
@@ -161,14 +161,14 @@ public:
ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}
// XBorder
- uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) override
{
table::BorderLine aBorderLine;
if ( getBorderLine( aBorderLine ) )
return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
throw uno::RuntimeException("No Implementation available" );
}
- void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) override
{
sal_Int32 nColor = 0;
_color >>= nColor;
@@ -182,7 +182,7 @@ public:
throw uno::RuntimeException("No Implementation available" );
}
- uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) override
{
sal_Int32 nColor = 0;
XLRGBToOORGB( getColor() ) >>= nColor;
@@ -202,7 +202,7 @@ public:
return uno::makeAny(nIndex);
}
- void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) override
{
sal_Int32 nColor = 0;
_colorindex >>= nColor;
@@ -210,7 +210,7 @@ public:
nColor = 1;
setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) );
}
- uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) override
{
table::BorderLine aBorderLine;
if ( getBorderLine( aBorderLine ) )
@@ -232,7 +232,7 @@ public:
}
throw uno::RuntimeException("Method failed" );
}
- void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) override
{
sal_Int32 nWeight = 0;
_weight >>= nWeight;
@@ -262,12 +262,12 @@ public:
throw uno::RuntimeException("Method failed" );
}
- uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override
{
// always return xlContinuous;
return uno::makeAny( XlLineStyle::xlContinuous );
}
- void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override
{
// Urk no choice but to silently ignore we don't support this attribute
// #TODO would be nice to support the excel line styles
@@ -321,11 +321,11 @@ public:
{
}
// XIndexAccess
- virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override
{
return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] );
}
- virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
sal_Int32 nIndex = getTableIndex( Index );
@@ -336,11 +336,11 @@ public:
}
throw lang::IndexOutOfBoundsException();
}
- virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override
{
return cppu::UnoType<excel::XBorder>::get();
}
- virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override
{
return sal_True;
}
@@ -358,12 +358,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE
sal_Int32 nIndex;
public:
RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
- virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override
{
return ( nIndex < m_xIndexAccess->getCount() );
}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( nIndex < m_xIndexAccess->getCount() )
return m_xIndexAccess->getByIndex( nIndex++ );