diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sc/source/ui/vba/vbaborders.cxx | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
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
Diffstat (limited to 'sc/source/ui/vba/vbaborders.cxx')
-rw-r--r-- | sc/source/ui/vba/vbaborders.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index b9fc1ce982bc..47fb520f4ca6 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -144,11 +144,11 @@ private: } ScVbaBorder(); // no impl protected: - virtual OUString getServiceImplName() + virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString("ScVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -162,14 +162,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) + uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } - void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; _color >>= nColor; @@ -183,7 +183,7 @@ public: throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } - uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; @@ -203,7 +203,7 @@ public: return uno::makeAny(nIndex); } - void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; _colorindex >>= nColor; @@ -211,7 +211,7 @@ public: nColor = 1; setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) ); } - uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) @@ -233,7 +233,7 @@ public: } throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } - void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nWeight = 0; _weight >>= nWeight; @@ -263,12 +263,12 @@ public: throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the excel line styles @@ -322,11 +322,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_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) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nIndex = getTableIndex( Index ); @@ -337,11 +337,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<excel::XBorder>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -359,12 +359,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) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); |