diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2015-10-28 18:32:28 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-29 13:09:00 +0100 |
| commit | 7583e4f80f1d9501b49044bacfa13076b85bf099 (patch) | |
| tree | 044f952675b8df56fbef70224f6bb8b86c9c4efb /ucb | |
| parent | 61edd38549ae249a1609fa1baccd391b3c4f573f (diff) | |
ucb: GCC 4.6 also doesn't do "override"
But you can use SAL_OVERRIDE instead.
Change-Id: Id593aa5f734b291043dee58f0e5ac6ff8ee421ea
Reviewed-on: https://gerrit.libreoffice.org/19653
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit fc3044ce56afc3fb26fac7602d931d015c39df39)
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/image/ucpimage.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index 70d09672f40e..da44fd495b06 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -47,15 +47,15 @@ public: private: OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Sequence<OUString>{ "com.sun.star.ucb.ImageContentProvider"}; @@ -66,7 +66,7 @@ private: throw ( css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) - override + SAL_OVERRIDE { css::uno::Reference<css::uno::XComponentContext> context; { @@ -146,13 +146,13 @@ private: sal_Int32 SAL_CALL compareContentIds( css::uno::Reference<css::ucb::XContentIdentifier> const & Id1, css::uno::Reference<css::ucb::XContentIdentifier> const & Id2) - throw (css::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return Id1->getContentIdentifier().compareTo( Id2->getContentIdentifier()); } - void SAL_CALL disposing() override { + void SAL_CALL disposing() SAL_OVERRIDE { context_.clear(); } |