summaryrefslogtreecommitdiff
path: root/testtools/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /testtools/source
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'testtools/source')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx14
-rw-r--r--testtools/source/bridgetest/constructors.cxx12
-rw-r--r--testtools/source/bridgetest/cppobj.cxx200
-rw-r--r--testtools/source/bridgetest/currentcontextchecker.cxx2
-rw-r--r--testtools/source/bridgetest/currentcontextchecker.hxx2
-rw-r--r--testtools/source/bridgetest/multi.hxx34
6 files changed, 132 insertions, 132 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index c647b1cceae8..a29ca660d9c0 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -115,12 +115,12 @@ public:
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception);
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE;
// XMain
- virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -314,7 +314,7 @@ public:
void SAL_CALL callRecursivly(
const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall,
sal_Int32 nToCall )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
MutexGuard guard( m_mutex );
if( nToCall )
@@ -340,8 +340,8 @@ class MyClass : public osl::DebugBase<MyClass>, public OWeakObject
public:
MyClass();
virtual ~MyClass();
- 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;
};
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index f7d1468fdfd5..6247871d1e31 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -61,7 +61,7 @@ private:
virtual void SAL_CALL initialize(
css::uno::Sequence< css::uno::Any > const & arguments)
- throw (css::uno::Exception, std::exception);
+ throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
};
void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
@@ -208,17 +208,17 @@ private:
virtual void SAL_CALL initialize(
css::uno::Sequence< css::uno::Any > const & arguments)
- throw (css::uno::Exception, std::exception);
+ throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
//XMultiBase1
virtual double SAL_CALL getatt1()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setatt1( double _att1 )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL fn12( const OUString& arg )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
double m_attr1;
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 50c3992e5f49..af14d325d9d4 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -153,19 +153,19 @@ public:
OSL_TRACE( "> scalar Test_Impl dtor <" );
}
- void SAL_CALL acquire() throw ()
+ void SAL_CALL acquire() throw () SAL_OVERRIDE
{
OWeakObject::acquire();
}
- void SAL_CALL release() throw ()
+ void SAL_CALL release() throw () SAL_OVERRIDE
{
OWeakObject::release();
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception);
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE;
// XLBTestBase
virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
@@ -178,7 +178,7 @@ public:
const ::com::sun::star::uno::Any& rAny,
const ::com::sun::star::uno::Sequence<TestElement >& rSequence,
const TestData& rStruct )
- throw(com::sun::star::uno::RuntimeException, std::exception);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
sal_Int16& nShort, sal_uInt16& nUShort,
@@ -190,7 +190,7 @@ public:
::com::sun::star::uno::Any& rAny,
::com::sun::star::uno::Sequence<TestElement >& rSequence,
TestData& rStruct )
- throw(com::sun::star::uno::RuntimeException, std::exception);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
sal_Int16& nShort, sal_uInt16& nUShort,
@@ -202,228 +202,228 @@ public:
::com::sun::star::uno::Any& rAny,
::com::sun::star::uno::Sequence< TestElement >& rSequence,
TestData& rStruct )
- throw(com::sun::star::uno::RuntimeException, std::exception);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return rStruct; }
- virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return i2; }
- virtual double SAL_CALL testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 ) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual double SAL_CALL testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10; }
- virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Bool; }
- virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Byte; }
- virtual sal_Unicode SAL_CALL getChar() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Unicode SAL_CALL getChar() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Char; }
- virtual sal_Int16 SAL_CALL getShort() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Int16 SAL_CALL getShort() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Short; }
- virtual sal_uInt16 SAL_CALL getUShort() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_uInt16 SAL_CALL getUShort() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.UShort; }
- virtual sal_Int32 SAL_CALL getLong() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Int32 SAL_CALL getLong() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Long; }
- virtual sal_uInt32 SAL_CALL getULong() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_uInt32 SAL_CALL getULong() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.ULong; }
- virtual sal_Int64 SAL_CALL getHyper() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_Int64 SAL_CALL getHyper() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Hyper; }
- virtual sal_uInt64 SAL_CALL getUHyper() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual sal_uInt64 SAL_CALL getUHyper() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.UHyper; }
- virtual float SAL_CALL getFloat() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual float SAL_CALL getFloat() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Float; }
- virtual double SAL_CALL getDouble() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual double SAL_CALL getDouble() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Double; }
- virtual TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Enum; }
- virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.String; }
- virtual com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getInterface( ) throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getInterface( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Interface; }
- virtual com::sun::star::uno::Any SAL_CALL getAny() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual com::sun::star::uno::Any SAL_CALL getAny() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Any; }
- virtual com::sun::star::uno::Sequence< TestElement > SAL_CALL getSequence() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual com::sun::star::uno::Sequence< TestElement > SAL_CALL getSequence() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aData.Sequence; }
- virtual TestData SAL_CALL getStruct() throw(com::sun::star::uno::RuntimeException, std::exception)
+ virtual TestData SAL_CALL getStruct() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return _aStructData; }
- virtual void SAL_CALL setBool( sal_Bool _bool ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setBool( sal_Bool _bool ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Bool = _bool; }
- virtual void SAL_CALL setByte( sal_Int8 _byte ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setByte( sal_Int8 _byte ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Byte = _byte; }
- virtual void SAL_CALL setChar( sal_Unicode _char ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setChar( sal_Unicode _char ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Char = _char; }
- virtual void SAL_CALL setShort( sal_Int16 _short ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setShort( sal_Int16 _short ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Short = _short; }
- virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.UShort = _ushort; }
- virtual void SAL_CALL setLong( sal_Int32 _long ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setLong( sal_Int32 _long ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Long = _long; }
- virtual void SAL_CALL setULong( sal_uInt32 _ulong ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setULong( sal_uInt32 _ulong ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.ULong = _ulong; }
- virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Hyper = _hyper; }
- virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.UHyper = _uhyper; }
- virtual void SAL_CALL setFloat( float _float ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setFloat( float _float ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Float = _float; }
- virtual void SAL_CALL setDouble( double _double ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setDouble( double _double ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Double = _double; }
- virtual void SAL_CALL setEnum( TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setEnum( TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Enum = _enum; }
- virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.String = _string; }
- virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Interface = _interface; }
- virtual void SAL_CALL setAny( const ::com::sun::star::uno::Any& _any ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setAny( const ::com::sun::star::uno::Any& _any ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Any = _any; }
- virtual void SAL_CALL setSequence( const ::com::sun::star::uno::Sequence<TestElement >& _sequence ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setSequence( const ::com::sun::star::uno::Sequence<TestElement >& _sequence ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aData.Sequence = _sequence; }
- virtual void SAL_CALL setStruct( const TestData& _struct ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL setStruct( const TestData& _struct ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ _aStructData = _struct; }
- virtual sal_Int32 SAL_CALL getRaiseAttr1() throw (RuntimeException, std::exception)
+ virtual sal_Int32 SAL_CALL getRaiseAttr1() throw (RuntimeException, std::exception) SAL_OVERRIDE
{ throw RuntimeException(); }
virtual void SAL_CALL setRaiseAttr1(sal_Int32)
- throw (IllegalArgumentException, RuntimeException, std::exception)
+ throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE
{ throw IllegalArgumentException(); }
virtual sal_Int32 SAL_CALL getRaiseAttr2()
- throw (IllegalArgumentException, RuntimeException, std::exception)
+ throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE
{ throw IllegalArgumentException(); }
virtual TestPolyStruct< sal_Bool > SAL_CALL transportPolyBoolean(
- TestPolyStruct< sal_Bool > const & arg) throw (RuntimeException, std::exception)
+ TestPolyStruct< sal_Bool > const & arg) throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return arg; }
virtual void SAL_CALL transportPolyHyper(TestPolyStruct< sal_Int64 > &)
- throw (RuntimeException, std::exception) {}
+ throw (RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL transportPolySequence(
TestPolyStruct< Sequence< Any > > const & arg1,
- TestPolyStruct< Sequence< Any > > & arg2) throw (RuntimeException, std::exception)
+ TestPolyStruct< Sequence< Any > > & arg2) throw (RuntimeException, std::exception) SAL_OVERRIDE
{ arg2 = arg1; }
virtual TestPolyStruct< sal_Int32 > SAL_CALL getNullPolyLong()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< sal_Int32 >(0); /* work around MS compiler bug */ }
virtual TestPolyStruct< OUString > SAL_CALL getNullPolyString()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< OUString >(); }
virtual TestPolyStruct< Type > SAL_CALL getNullPolyType()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< Type >(); }
virtual TestPolyStruct< Any > SAL_CALL getNullPolyAny()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< Any >(); }
virtual TestPolyStruct< Sequence< sal_Bool > > SAL_CALL
- getNullPolySequence() throw (RuntimeException, std::exception)
+ getNullPolySequence() throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< Sequence< sal_Bool > >(); }
virtual TestPolyStruct< TestEnum > SAL_CALL getNullPolyEnum()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< TestEnum >(
test::testtools::bridgetest::TestEnum_TEST);
/* work around MS compiler bug */ }
virtual TestPolyStruct< TestBadEnum > SAL_CALL getNullPolyBadEnum()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< TestBadEnum >(
test::testtools::bridgetest::TestBadEnum_M);
/* explicitly instantiate with default enumerator */ }
virtual TestPolyStruct< TestStruct > SAL_CALL getNullPolyStruct()
- throw (RuntimeException, std::exception)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< TestStruct >(); }
virtual TestPolyStruct< Reference< XBridgeTestBase > > SAL_CALL
- getNullPolyInterface() throw (RuntimeException, std::exception)
+ getNullPolyInterface() throw (RuntimeException, std::exception) SAL_OVERRIDE
{ return TestPolyStruct< Reference< XBridgeTestBase > >(); }
virtual ::com::sun::star::uno::Any SAL_CALL transportAny(
const ::com::sun::star::uno::Any& value )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL call( sal_Int32 nCallId, sal_Int32 nWaitMUSEC )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL callOneway( sal_Int32 nCallId, sal_Int32 nWaitMUSEC )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL sequenceOfCallTestPassed( )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL startRecursiveCall(
const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException, std::exception);
+ virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL testMulti(Reference< XMulti > const & multi)
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
public: // XBridgeTest
virtual TestData SAL_CALL raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xCOntext )
- throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL raiseRuntimeExceptionOneway(
const OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XBridgeTest2
virtual Sequence< sal_Bool > SAL_CALL setSequenceBool(
- const Sequence< sal_Bool >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Bool >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Unicode > SAL_CALL setSequenceChar(
- const Sequence< sal_Unicode >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Unicode >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int8 > SAL_CALL setSequenceByte(
- const Sequence< sal_Int8 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Int8 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int16 > SAL_CALL setSequenceShort(
- const Sequence< sal_Int16 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Int16 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_uInt16 > SAL_CALL setSequenceUShort(
- const Sequence< sal_uInt16 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_uInt16 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int32 > SAL_CALL setSequenceLong(
- const Sequence< sal_Int32 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Int32 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_uInt32 > SAL_CALL setSequenceULong(
- const Sequence< sal_uInt32 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_uInt32 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_Int64 > SAL_CALL setSequenceHyper(
- const Sequence< sal_Int64 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_Int64 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< sal_uInt64 > SAL_CALL setSequenceUHyper(
- const Sequence< sal_uInt64 >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< sal_uInt64 >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< float > SAL_CALL setSequenceFloat(
- const Sequence< float >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< float >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< double > SAL_CALL setSequenceDouble(
- const Sequence< double >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< double >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< TestEnum > SAL_CALL setSequenceEnum(
- const Sequence< TestEnum >& aSeq ) throw (RuntimeException, std::exception) ;
+ const Sequence< TestEnum >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE ;
virtual Sequence< OUString > SAL_CALL setSequenceString(
- const Sequence< OUString >& aString ) throw (RuntimeException, std::exception);
+ const Sequence< OUString >& aString ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< Reference< XInterface > > SAL_CALL setSequenceXInterface(
const Sequence< Reference< XInterface > >& aSeq )
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence<Any > SAL_CALL setSequenceAny(
- const Sequence<Any >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence<Any >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence<TestElement > SAL_CALL setSequenceStruct(
- const Sequence< TestElement >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence< TestElement >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< Sequence< sal_Int32 > > SAL_CALL setDim2(
- const Sequence<Sequence< sal_Int32 > >& aSeq ) throw (RuntimeException, std::exception);
+ const Sequence<Sequence< sal_Int32 > >& aSeq ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL setDim3(
const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq )
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setSequencesInOut(Sequence< sal_Bool >& aSeqBoolean,
Sequence< sal_Unicode >& aSeqChar,
Sequence< sal_Int8 >& aSeqByte,
@@ -441,7 +441,7 @@ public: // XBridgeTest
Sequence< Any >& aSeqAny,
Sequence< Sequence< sal_Int32 > >& aSeqDim2,
Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setSequencesOut( Sequence< sal_Bool >& aSeqBoolean,
Sequence< sal_Unicode >& aSeqChar,
Sequence< sal_Int8 >& aSeqByte,
@@ -459,16 +459,16 @@ public: // XBridgeTest
Sequence< Any >& aSeqAny,
Sequence< Sequence< sal_Int32 > >& aSeqDim2,
Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL testConstructorsService(
Reference< XComponentContext > const & context)
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
virtual Reference< XCurrentContextChecker > SAL_CALL
getCurrentContextChecker()
- throw (RuntimeException, std::exception);
+ throw (RuntimeException, std::exception) SAL_OVERRIDE;
public:
- virtual void SAL_CALL callRecursivly( const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL callRecursivly( const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
//Dummy class for XComponent implementation
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index ce3dc80175bb..5f500779795f 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -51,7 +51,7 @@ public:
virtual ~CurrentContext();
virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name)
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
CurrentContext(CurrentContext &); // not defined
diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx
index 96ab86bcbf49..cf9bcc2077d7 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -45,7 +45,7 @@ public:
::test::testtools::bridgetest::XCurrentContextChecker > const &
other,
::sal_Int32 setSteps, ::sal_Int32 checkSteps)
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
CurrentContextChecker(CurrentContextChecker &); // not defined
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index 155349d24dba..aef04f8c9510 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -37,71 +37,71 @@ public:
Multi(): m_attribute1(0.0), m_attribute3(0.0) {}
virtual double SAL_CALL getatt1()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return m_attribute1; }
virtual void SAL_CALL setatt1(double value)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ m_attribute1 = value; }
virtual sal_Int32 SAL_CALL fn11(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 11 * arg; }
virtual OUString SAL_CALL fn12(OUString const & arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("12") + arg; }
virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 21 * arg; }
virtual OUString SAL_CALL fn22(OUString const & arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("22") + arg; }
virtual double SAL_CALL getatt3()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return m_attribute3; }
virtual void SAL_CALL setatt3(double value)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ m_attribute3 = value; }
virtual sal_Int32 SAL_CALL fn31(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 31 * arg; }
virtual OUString SAL_CALL fn32(OUString const & arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("32") + arg; }
virtual sal_Int32 SAL_CALL fn33()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 33; }
virtual sal_Int32 SAL_CALL fn41(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 41 * arg; }
virtual sal_Int32 SAL_CALL fn61(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 61 * arg; }
virtual OUString SAL_CALL fn62(OUString const & arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("62") + arg; }
virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 71 * arg; }
virtual OUString SAL_CALL fn72(OUString const & arg)
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("72") + arg; }
virtual sal_Int32 SAL_CALL fn73()
- throw (com::sun::star::uno::RuntimeException, std::exception)
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return 73; }
private: