diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /io/source/connector | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'io/source/connector')
| -rw-r--r-- | io/source/connector/connector.cxx | 8 | ||||
| -rw-r--r-- | io/source/connector/connector.hxx | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 0bedf4dde13e..e564d3eb5669 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -57,12 +57,12 @@ namespace stoc_connector // Methods virtual Reference< XConnection > SAL_CALL connect( const OUString& sConnectionDescription ) - throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) SAL_OVERRIDE; + throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; }; OConnector::OConnector(const Reference< XComponentContext > &xCtx) diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index 820d9b730c6e..71d6abf01805 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -66,18 +66,18 @@ namespace stoc_connector virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: ::osl::StreamPipe m_pipe; oslInterlockedCount m_nStatus; @@ -95,25 +95,25 @@ namespace stoc_connector virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XConnectionBroadcaster virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: void completeConnectionString(); |