diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /io | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'io')
-rw-r--r-- | io/qa/textinputstream.cxx | 2 | ||||
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 2 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 2 | ||||
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 2 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 2 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 2 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 2 | ||||
-rw-r--r-- | io/source/connector/connector.hxx | 4 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 8 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 4 | ||||
-rw-r--r-- | io/source/stm/opipe.cxx | 2 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx index 5a58391460f4..d887f379c66b 100644 --- a/io/qa/textinputstream.cxx +++ b/io/qa/textinputstream.cxx @@ -39,7 +39,7 @@ public: Input(): open_(true), index_(0) {} private: - virtual ~Input() {} + virtual ~Input() override {} sal_Int32 SAL_CALL readBytes(css::uno::Sequence<sal_Int8> &, sal_Int32) throw ( diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 1852ed855939..5e43365ecc3c 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -78,7 +78,7 @@ class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo public: OTextInputStream(); - virtual ~OTextInputStream(); + virtual ~OTextInputStream() override; // Methods XTextInputStream virtual OUString SAL_CALL readLine( ) diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 684d2fe7349f..3bd4c8de181a 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -65,7 +65,7 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf public: OTextOutputStream(); - virtual ~OTextOutputStream(); + virtual ~OTextOutputStream() override; // Methods XTextOutputStream virtual void SAL_CALL writeString( const OUString& aString ) diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 87f47dcace20..0ebd65808321 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -43,7 +43,7 @@ namespace io_acceptor { public: explicit PipeConnection( const OUString &sConnectionDescription); - virtual ~PipeConnection(); + virtual ~PipeConnection() override; virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(css::io::IOException, diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index ae02856ea594..1c721ec4d753 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -70,7 +70,7 @@ namespace io_acceptor { { public: explicit SocketConnection( const OUString & sConnectionDescription ); - virtual ~SocketConnection(); + virtual ~SocketConnection() override; virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 9d918338002b..b6ef0a33556f 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -50,7 +50,7 @@ namespace io_acceptor { public: explicit OAcceptor(const Reference< XComponentContext > & xCtx); - virtual ~OAcceptor(); + virtual ~OAcceptor() override; public: // Methods virtual Reference< XConnection > SAL_CALL accept( const OUString& sConnectionDescription ) diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 91071feb803d..aeeb0354b3f4 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -53,7 +53,7 @@ namespace stoc_connector Reference< XComponentContext > _xCtx; public: explicit OConnector(const Reference< XComponentContext > &xCtx); - virtual ~OConnector(); + virtual ~OConnector() override; // Methods virtual Reference< XConnection > SAL_CALL connect( const OUString& sConnectionDescription ) diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index 3650ed0d357b..3381cf0cdc22 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -61,7 +61,7 @@ namespace stoc_connector { public: explicit PipeConnection( const OUString &sConnectionDescription ); - virtual ~PipeConnection(); + virtual ~PipeConnection() override; virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) @@ -90,7 +90,7 @@ namespace stoc_connector { public: explicit SocketConnection( const OUString & sConnectionDescription ); - virtual ~SocketConnection(); + virtual ~SocketConnection() override; virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 9e2f71794fca..0ba3e2bc6c5e 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -62,7 +62,7 @@ public: { } - virtual ~ODataInputStream(); + virtual ~ODataInputStream() override; public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, @@ -498,7 +498,7 @@ public: : m_bValidStream( false ) { } - virtual ~ODataOutputStream(); + virtual ~ODataOutputStream() override; public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) @@ -908,7 +908,7 @@ public: { } - virtual ~OObjectOutputStream(); + virtual ~OObjectOutputStream() override; public: // XOutputStream @@ -1171,7 +1171,7 @@ public: , m_bValidMarkable(false) { } - virtual ~OObjectInputStream(); + virtual ~OObjectInputStream() override; public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 55c2fcdd8fc4..9cb1fa402001 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -75,7 +75,7 @@ class OMarkableOutputStream : { public: OMarkableOutputStream( ); - virtual ~OMarkableOutputStream(); + virtual ~OMarkableOutputStream() override; public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) @@ -469,7 +469,7 @@ class OMarkableInputStream : { public: OMarkableInputStream( ); - virtual ~OMarkableInputStream(); + virtual ~OMarkableInputStream() override; public: // XInputStream diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 8e3ecd2f2b67..be0905a08786 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -55,7 +55,7 @@ class OPipeImpl : { public: OPipeImpl( ); - virtual ~OPipeImpl(); + virtual ~OPipeImpl() override; public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 8cf275620862..147ba94be334 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -77,7 +77,7 @@ namespace io_stm { public: Pump(); - virtual ~Pump(); + virtual ~Pump() override; // XActiveDataSource virtual void SAL_CALL setOutputStream( const Reference< css::io::XOutputStream >& xOutput ) throw(std::exception) override; |