diff options
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 8 | ||||
-rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 16 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 196 | ||||
-rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.hxx | 10 | ||||
-rw-r--r-- | testtools/source/bridgetest/multi.cxx | 4 | ||||
-rw-r--r-- | testtools/source/bridgetest/multi.hxx | 38 | ||||
-rw-r--r-- | testtools/source/performance/ubobject.cxx | 90 |
7 files changed, 177 insertions, 185 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 679dce605d9a..f67d9abdb3c4 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -189,8 +189,8 @@ static void assign( TestElement & rData, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, TestEnum eEnum, const OUString& rStr, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - const ::com::sun::star::uno::Any& rAny ) + const css::uno::Reference< css::uno::XInterface >& xTest, + const css::uno::Any& rAny ) { rData.Bool = bBool; rData.Char = cChar; @@ -311,9 +311,9 @@ private: public: void SAL_CALL callRecursivly( - const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, + const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { MutexGuard guard( m_mutex ); if( nToCall ) diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index eb4c4879d027..7ddd9c58666b 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -212,13 +212,13 @@ private: //XMultiBase1 virtual double SAL_CALL getatt1() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setatt1( double _att1 ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL fn12( const OUString& arg ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; double m_attr1; @@ -411,24 +411,24 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) //XMultiBase1 double Impl2::getatt1() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return m_attr1; } -void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeException, std::exception) +void Impl2::setatt1( double _att1 )throw (css::uno::RuntimeException, std::exception) { m_attr1 = _att1; } ::sal_Int32 Impl2::fn11( ::sal_Int32 arg ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return 11 * arg; } OUString Impl2::fn12( const OUString& arg ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return "12" + arg; } diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 57b7b4750824..08232f6c5943 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -76,8 +76,8 @@ static void assign( TestElement & rData, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, TestEnum eEnum, const OUString& rStr, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - const ::com::sun::star::uno::Any& rAny ) + const css::uno::Reference< css::uno::XInterface >& xTest, + const css::uno::Any& rAny ) { rData.Bool = bBool; rData.Char = cChar; @@ -103,9 +103,9 @@ static void assign( TestData & rData, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, TestEnum eEnum, const OUString& rStr, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - const ::com::sun::star::uno::Any& rAny, - const com::sun::star::uno::Sequence< TestElement >& rSequence ) + const css::uno::Reference< css::uno::XInterface >& xTest, + const css::uno::Any& rAny, + const css::uno::Sequence< TestElement >& rSequence ) { assign( (TestElement &)rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, @@ -174,11 +174,11 @@ public: sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, TestEnum eEnum, const OUString& rStr, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - const ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Sequence<TestElement >& rSequence, + const css::uno::Reference< css::uno::XInterface >& xTest, + const css::uno::Any& rAny, + const css::uno::Sequence<TestElement >& rSequence, const TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, @@ -186,11 +186,11 @@ public: sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, TestEnum& eEnum, OUString& rStr, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - ::com::sun::star::uno::Any& rAny, - ::com::sun::star::uno::Sequence<TestElement >& rSequence, + css::uno::Reference< css::uno::XInterface >& xTest, + css::uno::Any& rAny, + css::uno::Sequence<TestElement >& rSequence, TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, @@ -198,100 +198,100 @@ public: sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, TestEnum& eEnum, OUString& rStr, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - ::com::sun::star::uno::Any& rAny, - ::com::sun::star::uno::Sequence< TestElement >& rSequence, + css::uno::Reference< css::uno::XInterface >& xTest, + css::uno::Any& rAny, + css::uno::Sequence< TestElement >& rSequence, TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) throw(css::uno::RuntimeException, std::exception) override { return rStruct; } - virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) throw(css::uno::RuntimeException, std::exception) 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) override + virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(css::uno::RuntimeException, std::exception) override { return i2; } - virtual sal_Int32 SAL_CALL testPPC64Alignment( double , double , double , sal_Int32 i1 ) throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL testPPC64Alignment( double , double , double , sal_Int32 i1 ) throw(css::uno::RuntimeException, std::exception) override { return i1; } - 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) override + 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(css::uno::RuntimeException, std::exception) 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) override + virtual sal_Bool SAL_CALL getBool() throw(css::uno::RuntimeException, std::exception) override { return _aData.Bool; } - virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Int8 SAL_CALL getByte() throw(css::uno::RuntimeException, std::exception) override { return _aData.Byte; } - virtual sal_Unicode SAL_CALL getChar() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Unicode SAL_CALL getChar() throw(css::uno::RuntimeException, std::exception) override { return _aData.Char; } - virtual sal_Int16 SAL_CALL getShort() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getShort() throw(css::uno::RuntimeException, std::exception) override { return _aData.Short; } - virtual sal_uInt16 SAL_CALL getUShort() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_uInt16 SAL_CALL getUShort() throw(css::uno::RuntimeException, std::exception) override { return _aData.UShort; } - virtual sal_Int32 SAL_CALL getLong() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getLong() throw(css::uno::RuntimeException, std::exception) override { return _aData.Long; } - virtual sal_uInt32 SAL_CALL getULong() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_uInt32 SAL_CALL getULong() throw(css::uno::RuntimeException, std::exception) override { return _aData.ULong; } - virtual sal_Int64 SAL_CALL getHyper() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Int64 SAL_CALL getHyper() throw(css::uno::RuntimeException, std::exception) override { return _aData.Hyper; } - virtual sal_uInt64 SAL_CALL getUHyper() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_uInt64 SAL_CALL getUHyper() throw(css::uno::RuntimeException, std::exception) override { return _aData.UHyper; } - virtual float SAL_CALL getFloat() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual float SAL_CALL getFloat() throw(css::uno::RuntimeException, std::exception) override { return _aData.Float; } - virtual double SAL_CALL getDouble() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual double SAL_CALL getDouble() throw(css::uno::RuntimeException, std::exception) override { return _aData.Double; } - virtual TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual TestEnum SAL_CALL getEnum() throw(css::uno::RuntimeException, std::exception) override { return _aData.Enum; } - virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) 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) override + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getInterface( ) throw(css::uno::RuntimeException, std::exception) override { return _aData.Interface; } - virtual com::sun::star::uno::Any SAL_CALL getAny() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getAny() throw(css::uno::RuntimeException, std::exception) override { return _aData.Any; } - virtual com::sun::star::uno::Sequence< TestElement > SAL_CALL getSequence() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< TestElement > SAL_CALL getSequence() throw(css::uno::RuntimeException, std::exception) override { return _aData.Sequence; } - virtual TestData SAL_CALL getStruct() throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual TestData SAL_CALL getStruct() throw(css::uno::RuntimeException, std::exception) override { return _aStructData; } - virtual void SAL_CALL setBool( sal_Bool _bool ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setBool( sal_Bool _bool ) throw(css::uno::RuntimeException, std::exception) override { _aData.Bool = _bool; } - virtual void SAL_CALL setByte( sal_Int8 _byte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setByte( sal_Int8 _byte ) throw(css::uno::RuntimeException, std::exception) override { _aData.Byte = _byte; } - virtual void SAL_CALL setChar( sal_Unicode _char ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setChar( sal_Unicode _char ) throw(css::uno::RuntimeException, std::exception) override { _aData.Char = _char; } - virtual void SAL_CALL setShort( sal_Int16 _short ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setShort( sal_Int16 _short ) throw(css::uno::RuntimeException, std::exception) override { _aData.Short = _short; } - virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) throw(css::uno::RuntimeException, std::exception) override { _aData.UShort = _ushort; } - virtual void SAL_CALL setLong( sal_Int32 _long ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setLong( sal_Int32 _long ) throw(css::uno::RuntimeException, std::exception) override { _aData.Long = _long; } - virtual void SAL_CALL setULong( sal_uInt32 _ulong ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setULong( sal_uInt32 _ulong ) throw(css::uno::RuntimeException, std::exception) override { _aData.ULong = _ulong; } - virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(css::uno::RuntimeException, std::exception) override { _aData.Hyper = _hyper; } - virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) throw(css::uno::RuntimeException, std::exception) override { _aData.UHyper = _uhyper; } - virtual void SAL_CALL setFloat( float _float ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFloat( float _float ) throw(css::uno::RuntimeException, std::exception) override { _aData.Float = _float; } - virtual void SAL_CALL setDouble( double _double ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDouble( double _double ) throw(css::uno::RuntimeException, std::exception) override { _aData.Double = _double; } - virtual void SAL_CALL setEnum( TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setEnum( TestEnum _enum ) throw(css::uno::RuntimeException, std::exception) override { _aData.Enum = _enum; } - virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setString( const OUString& _string ) throw(css::uno::RuntimeException, std::exception) 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) override + virtual void SAL_CALL setInterface( const css::uno::Reference< css::uno::XInterface >& _interface ) throw(css::uno::RuntimeException, std::exception) override { _aData.Interface = _interface; } - virtual void SAL_CALL setAny( const ::com::sun::star::uno::Any& _any ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setAny( const css::uno::Any& _any ) throw(css::uno::RuntimeException, std::exception) 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) override + virtual void SAL_CALL setSequence( const css::uno::Sequence<TestElement >& _sequence ) throw(css::uno::RuntimeException, std::exception) override { _aData.Sequence = _sequence; } - virtual void SAL_CALL setStruct( const TestData& _struct ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setStruct( const TestData& _struct ) throw(css::uno::RuntimeException, std::exception) override { _aStructData = _struct; } virtual sal_Int32 SAL_CALL getRaiseAttr1() throw (RuntimeException, std::exception) override @@ -357,19 +357,19 @@ public: getNullPolyInterface() throw (RuntimeException, std::exception) 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) override; + virtual css::uno::Any SAL_CALL transportAny( + const css::uno::Any& value ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL call( sal_Int32 nCallId, sal_Int32 nWaitMUSEC ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL callOneway( sal_Int32 nCallId, sal_Int32 nWaitMUSEC ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL sequenceOfCallTestPassed( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) + throw(css::uno::RuntimeException, std::exception) override; virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException, std::exception) override; @@ -378,14 +378,14 @@ public: 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) override; + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) 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) override; + const OUString& Message, const css::uno::Reference< css::uno::XInterface >& Context ) + throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRuntimeException() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(css::uno::RuntimeException, std::exception) override; // XBridgeTest2 virtual Sequence< sal_Bool > SAL_CALL setSequenceBool( @@ -470,7 +470,7 @@ public: // XBridgeTest throw (RuntimeException, std::exception) 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) override; + virtual void SAL_CALL callRecursivly( const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) throw(css::uno::RuntimeException, std::exception) override; }; //Dummy class for XComponent implementation @@ -482,7 +482,7 @@ public: }; -Any Test_Impl::transportAny( const Any & value ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +Any Test_Impl::transportAny( const Any & value ) throw ( css::uno::RuntimeException, std::exception) { return value; } @@ -501,7 +501,7 @@ void wait(sal_Int32 microSeconds) { } -void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(css::uno::RuntimeException, std::exception) { wait(nWaitMUSEC); if( m_bFirstCall ) @@ -516,7 +516,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su } -void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (css::uno::RuntimeException, std::exception) { wait(nWaitMUSEC); m_bSequenceOfCallTestPassed = m_bSequenceOfCallTestPassed && (nCallId > m_nLastCallId); @@ -524,15 +524,15 @@ void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (:: } -sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (css::uno::RuntimeException, std::exception) { return m_bSequenceOfCallTestPassed; } void SAL_CALL Test_Impl::startRecursiveCall( - const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) + throw(css::uno::RuntimeException, std::exception) { MutexGuard guard( m_mutex ); if( nToCall ) @@ -544,9 +544,9 @@ void SAL_CALL Test_Impl::startRecursiveCall( void SAL_CALL Test_Impl::callRecursivly( - const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, + const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { MutexGuard guard( m_mutex ); if( nToCall ) @@ -573,11 +573,11 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, TestEnum eEnum, const OUString& rStr, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - const ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Sequence<TestElement >& rSequence, + const css::uno::Reference< css::uno::XInterface >& xTest, + const css::uno::Any& rAny, + const css::uno::Sequence<TestElement >& rSequence, const TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { assign( _aData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, @@ -591,11 +591,11 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, TestEnum& eEnum, OUString& rStr, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - ::com::sun::star::uno::Any& rAny, - ::com::sun::star::uno::Sequence<TestElement >& rSequence, + css::uno::Reference< css::uno::XInterface >& xTest, + css::uno::Any& rAny, + css::uno::Sequence<TestElement >& rSequence, TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { assign( _aData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, @@ -615,11 +615,11 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, TestEnum& eEnum, OUString& rStr, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, - ::com::sun::star::uno::Any& rAny, - ::com::sun::star::uno::Sequence<TestElement >& rSequence, + css::uno::Reference< css::uno::XInterface >& xTest, + css::uno::Any& rAny, + css::uno::Sequence<TestElement >& rSequence, TestData& rStruct ) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { bBool = _aData.Bool; cChar = _aData.Char; @@ -642,7 +642,7 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB } TestData Test_Impl::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(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { IllegalArgumentException aExc; aExc.ArgumentPosition = nArgumentPos; @@ -652,7 +652,7 @@ TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMs } void Test_Impl::raiseRuntimeExceptionOneway( const OUString & rMsg, const Reference< XInterface > & xContext ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { RuntimeException aExc; aExc.Message = _aData.String = rMsg; @@ -710,7 +710,7 @@ sal_Int32 Test_Impl::getRuntimeException() return 0; // for dummy } -void Test_Impl::setRuntimeException( sal_Int32 ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void Test_Impl::setRuntimeException( sal_Int32 ) throw(css::uno::RuntimeException, std::exception) { RuntimeException aExc; aExc.Message = _aData.String; diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx index 7ea1fe94274b..9c4a72a9e7c6 100644 --- a/testtools/source/bridgetest/currentcontextchecker.hxx +++ b/testtools/source/bridgetest/currentcontextchecker.hxx @@ -41,20 +41,16 @@ public: virtual ~CurrentContextChecker(); virtual sal_Bool SAL_CALL perform( - ::com::sun::star::uno::Reference< - ::test::testtools::bridgetest::XCurrentContextChecker > const & - other, + css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other, ::sal_Int32 setSteps, ::sal_Int32 checkSteps) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: CurrentContextChecker(CurrentContextChecker &) = delete; void operator =(CurrentContextChecker &) = delete; bool performCheck( - ::com::sun::star::uno::Reference< - ::test::testtools::bridgetest::XCurrentContextChecker > const & - other, + css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other, ::sal_Int32 setSteps, ::sal_Int32 checkSteps); }; diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index 15aef4d18593..99aaeffc4a36 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -56,9 +56,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) { namespace testtools { namespace bridgetest { -OUString testMulti( - com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti > - const & multi) +OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti > const & multi ) { try { checkEqual( diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx index aeca60f2f937..9909ce573247 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) override + throw (css::uno::RuntimeException, std::exception) override { return m_attribute1; } virtual void SAL_CALL setatt1(double value) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_attribute1 = value; } virtual sal_Int32 SAL_CALL fn11(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 11 * arg; } virtual OUString SAL_CALL fn12(OUString const & arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return "12" + arg; } virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 21 * arg; } virtual OUString SAL_CALL fn22(OUString const & arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return "22" + arg; } virtual double SAL_CALL getatt3() - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return m_attribute3; } virtual void SAL_CALL setatt3(double value) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_attribute3 = value; } virtual sal_Int32 SAL_CALL fn31(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 31 * arg; } virtual OUString SAL_CALL fn32(OUString const & arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return "32" + arg; } virtual sal_Int32 SAL_CALL fn33() - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 33; } virtual sal_Int32 SAL_CALL fn41(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 41 * arg; } virtual sal_Int32 SAL_CALL fn61(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 61 * arg; } virtual OUString SAL_CALL fn62(OUString const & arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return "62" + arg; } virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 71 * arg; } virtual OUString SAL_CALL fn72(OUString const & arg) - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return "72" + arg; } virtual sal_Int32 SAL_CALL fn73() - throw (com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return 73; } private: @@ -109,9 +109,7 @@ private: double m_attribute3; }; -OUString testMulti( - com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti > - const & multi); +OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti > const & multi); } } diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index bd1fc93cfa87..3b8a04d4b11d 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -73,7 +73,7 @@ public: {} // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException) + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException) { // execution time remains appr. constant any time Any aRet; @@ -105,96 +105,96 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); // Attributes - virtual sal_Int32 SAL_CALL getLong_attr() throw(::com::sun::star::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getLong_attr() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setLong_attr( sal_Int32 _attributelong ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setLong_attr( sal_Int32 _attributelong ) throw(css::uno::RuntimeException) {} - virtual sal_Int64 SAL_CALL getHyper_attr() throw(::com::sun::star::uno::RuntimeException) + virtual sal_Int64 SAL_CALL getHyper_attr() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setHyper_attr( sal_Int64 _attributehyper ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setHyper_attr( sal_Int64 _attributehyper ) throw(css::uno::RuntimeException) {} - virtual float SAL_CALL getFloat_attr() throw(::com::sun::star::uno::RuntimeException) + virtual float SAL_CALL getFloat_attr() throw(css::uno::RuntimeException) { return 0.0; } - virtual void SAL_CALL setFloat_attr( float _attributefloat ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setFloat_attr( float _attributefloat ) throw(css::uno::RuntimeException) {} - virtual double SAL_CALL getDouble_attr() throw(::com::sun::star::uno::RuntimeException) + virtual double SAL_CALL getDouble_attr() throw(css::uno::RuntimeException) { return 0.0; } - virtual void SAL_CALL setDouble_attr( double _attributedouble ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setDouble_attr( double _attributedouble ) throw(css::uno::RuntimeException) {} - virtual OUString SAL_CALL getString_attr() throw(::com::sun::star::uno::RuntimeException) + virtual OUString SAL_CALL getString_attr() throw(css::uno::RuntimeException) { return _aDummyString; } - virtual void SAL_CALL setString_attr( const OUString& _attributestring ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString_attr( const OUString& _attributestring ) throw(css::uno::RuntimeException) {} - virtual Reference< XInterface > SAL_CALL getInterface_attr() throw(::com::sun::star::uno::RuntimeException) + virtual Reference< XInterface > SAL_CALL getInterface_attr() throw(css::uno::RuntimeException) { return Reference< XInterface >(); } - virtual void SAL_CALL setInterface_attr( const Reference< XInterface >& _attributeinterface ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setInterface_attr( const Reference< XInterface >& _attributeinterface ) throw(css::uno::RuntimeException) {} - virtual Any SAL_CALL getAny_attr() throw(::com::sun::star::uno::RuntimeException) + virtual Any SAL_CALL getAny_attr() throw(css::uno::RuntimeException) { return _aDummyAny; } - virtual void SAL_CALL setAny_attr( const Any& _attributeany ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setAny_attr( const Any& _attributeany ) throw(css::uno::RuntimeException) {} - virtual Sequence< Reference< XInterface > > SAL_CALL getSequence_attr() throw(::com::sun::star::uno::RuntimeException) + virtual Sequence< Reference< XInterface > > SAL_CALL getSequence_attr() throw(css::uno::RuntimeException) { return _aDummySequence; } - virtual void SAL_CALL setSequence_attr( const Sequence< Reference< XInterface > >& _attributesequence ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setSequence_attr( const Sequence< Reference< XInterface > >& _attributesequence ) throw(css::uno::RuntimeException) {} - virtual ComplexTypes SAL_CALL getStruct_attr() throw(::com::sun::star::uno::RuntimeException) + virtual ComplexTypes SAL_CALL getStruct_attr() throw(css::uno::RuntimeException) { return _aDummyStruct; } - virtual void SAL_CALL setStruct_attr( const ::com::sun::star::test::performance::ComplexTypes& _attributestruct ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setStruct_attr( const css::test::performance::ComplexTypes& _attributestruct ) throw(css::uno::RuntimeException) {} // Methods - virtual sal_Int32 SAL_CALL getLong() throw(::com::sun::star::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getLong() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setLong( sal_Int32 _long ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setLong( sal_Int32 _long ) throw(css::uno::RuntimeException) {} - virtual sal_Int64 SAL_CALL getHyper() throw(::com::sun::star::uno::RuntimeException) + virtual sal_Int64 SAL_CALL getHyper() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(css::uno::RuntimeException) {} - virtual float SAL_CALL getFloat() throw(::com::sun::star::uno::RuntimeException) + virtual float SAL_CALL getFloat() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setFloat( float _float ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setFloat( float _float ) throw(css::uno::RuntimeException) {} - virtual double SAL_CALL getDouble() throw(::com::sun::star::uno::RuntimeException) + virtual double SAL_CALL getDouble() throw(css::uno::RuntimeException) { return 0; } - virtual void SAL_CALL setDouble( double _double ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setDouble( double _double ) throw(css::uno::RuntimeException) {} - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException) + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException) { return _aDummyString; } - virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString( const OUString& _string ) throw(css::uno::RuntimeException) {} - virtual Reference< XInterface > SAL_CALL getInterface() throw(::com::sun::star::uno::RuntimeException) + virtual Reference< XInterface > SAL_CALL getInterface() throw(css::uno::RuntimeException) { return Reference< XInterface >(); } - virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setInterface( const css::uno::Reference< css::uno::XInterface >& _interface ) throw(css::uno::RuntimeException) {} - virtual Any SAL_CALL getAny() throw(::com::sun::star::uno::RuntimeException) + virtual Any SAL_CALL getAny() throw(css::uno::RuntimeException) { return _aDummyAny; } - virtual void SAL_CALL setAny( const ::com::sun::star::uno::Any& _any ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setAny( const css::uno::Any& _any ) throw(css::uno::RuntimeException) {} - virtual Sequence< Reference< XInterface > > SAL_CALL getSequence() throw(::com::sun::star::uno::RuntimeException) + virtual Sequence< Reference< XInterface > > SAL_CALL getSequence() throw(css::uno::RuntimeException) { return _aDummySequence; } - virtual void SAL_CALL setSequence( const Sequence< Reference< XInterface > >& _sequence ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setSequence( const Sequence< Reference< XInterface > >& _sequence ) throw(css::uno::RuntimeException) {} - virtual ComplexTypes SAL_CALL getStruct() throw(::com::sun::star::uno::RuntimeException) + virtual ComplexTypes SAL_CALL getStruct() throw(css::uno::RuntimeException) { return _aDummyStruct; } - virtual void SAL_CALL setStruct( const ::com::sun::star::test::performance::ComplexTypes& c ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setStruct( const css::test::performance::ComplexTypes& c ) throw(css::uno::RuntimeException) {} - virtual void SAL_CALL async() throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL async() throw(css::uno::RuntimeException) {} - virtual void SAL_CALL sync() throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL sync() throw(css::uno::RuntimeException) {} - virtual ComplexTypes SAL_CALL complex_in( const ::com::sun::star::test::performance::ComplexTypes& aVal ) throw(::com::sun::star::uno::RuntimeException) + virtual ComplexTypes SAL_CALL complex_in( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException) { return aVal; } - virtual ComplexTypes SAL_CALL complex_inout( ::com::sun::star::test::performance::ComplexTypes& aVal ) throw(::com::sun::star::uno::RuntimeException) + virtual ComplexTypes SAL_CALL complex_inout( css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException) { return aVal; } - virtual void SAL_CALL complex_oneway( const ::com::sun::star::test::performance::ComplexTypes& aVal ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL complex_oneway( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException) {} - virtual void SAL_CALL complex_noreturn( const ::com::sun::star::test::performance::ComplexTypes& aVal ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL complex_noreturn( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException) {} - virtual Reference< XPerformanceTest > SAL_CALL createObject() throw(::com::sun::star::uno::RuntimeException) + virtual Reference< XPerformanceTest > SAL_CALL createObject() throw(css::uno::RuntimeException) { return new ServiceImpl(); } - virtual void SAL_CALL raiseRuntimeException( ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL raiseRuntimeException( ) throw(css::uno::RuntimeException) { throw _aDummyRE; } }; |