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 /binaryurp | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'binaryurp')
-rw-r--r-- | binaryurp/source/bridge.hxx | 12 | ||||
-rw-r--r-- | binaryurp/source/bridgefactory.hxx | 14 | ||||
-rw-r--r-- | binaryurp/source/reader.hxx | 2 | ||||
-rw-r--r-- | binaryurp/source/writer.hxx | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index a35f7d16612b..c89e85b0919a 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -176,26 +176,26 @@ private: virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getInstance(OUString const & sInstanceName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (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; virtual void SAL_CALL dispose() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & aListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // Only called from reader_ thread: void sendCommitChangeRequest(); diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index f7103bdd3aeb..ad96b85417eb 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -85,13 +85,13 @@ private: virtual ~BridgeFactory(); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL createBridge( @@ -104,19 +104,19 @@ private: throw ( com::sun::star::bridge::BridgeExistsException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL getBridge( OUString const & sName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > - SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; typedef std::list< diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx index 436e06d81ef4..8dd4822a6cad 100644 --- a/binaryurp/source/reader.hxx +++ b/binaryurp/source/reader.hxx @@ -45,7 +45,7 @@ public: private: virtual ~Reader(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void readMessage(Unmarshal & unmarshal); diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx index 4ac119281109..bd08181d8860 100644 --- a/binaryurp/source/writer.hxx +++ b/binaryurp/source/writer.hxx @@ -83,7 +83,7 @@ public: private: virtual ~Writer(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void sendRequest( rtl::ByteSequence const & tid, OUString const & oid, |