summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /ucbhelper
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/source/client/content.cxx20
-rw-r--r--ucbhelper/source/client/proxydecider.cxx4
-rw-r--r--ucbhelper/source/provider/resultset.cxx16
-rw-r--r--ucbhelper/source/provider/simplenameclashresolverequest.cxx14
4 files changed, 27 insertions, 27 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 677a6a0d442d..a384a5e7e0e2 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -81,16 +81,16 @@ class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream >
public:
virtual sal_Int32 SAL_CALL readBytes(
Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead )
- throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (IOException, RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL readSomeBytes(
Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead )
- throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (IOException, RuntimeException, std::exception) override;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
- throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (IOException, RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL available()
- throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (IOException, RuntimeException, std::exception) override;
virtual void SAL_CALL closeInput()
- throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (IOException, RuntimeException, std::exception) override;
};
sal_Int32 EmptyInputStream::readBytes(
@@ -145,19 +145,19 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual void SAL_CALL release()
- throw() SAL_OVERRIDE;
+ throw() override;
// XContentEventListener
virtual void SAL_CALL contentEvent( const ContentEvent& evt )
- throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( RuntimeException, std::exception ) override;
// XEventListener ( base of XContentEventListener )
virtual void SAL_CALL disposing( const EventObject& Source )
- throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( RuntimeException, std::exception ) override;
};
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index b5672d596ef3..eb200c8f5e95 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -145,11 +145,11 @@ public:
// XChangesListener
virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event )
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
// XEventListener ( base of XChangesLisetenr )
virtual void SAL_CALL disposing( const lang::EventObject& Source )
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
private:
void setNoProxyList( const OUString & rNoProxyList );
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 31617fd7feec..417396b9e2df 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -100,26 +100,26 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual void SAL_CALL release()
- throw() SAL_OVERRIDE;
+ throw() override;
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XPropertySetInfo
virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
virtual beans::Property SAL_CALL getPropertyByName(
const OUString& aName )
- throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
};
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 39abc5b77902..76a3ff13fe60 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -46,27 +46,27 @@ public:
// XInterface
virtual com::sun::star::uno::Any SAL_CALL
queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual void SAL_CALL release()
- throw() SAL_OVERRIDE;
+ throw() override;
// XTypeProvider
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
getTypes()
- 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< sal_Int8 > SAL_CALL
getImplementationId()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
// XInteractionContinuation
virtual void SAL_CALL select()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
// XInteractionSupplyName
virtual void SAL_CALL setName( const OUString& Name )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
// Non-interface methods.