summaryrefslogtreecommitdiff
path: root/pyuno
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 /pyuno
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/module/pyuno_gc.cxx2
-rw-r--r--pyuno/source/module/pyuno_impl.hxx14
2 files changed, 8 insertions, 8 deletions
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index 80cb9e11b810..0a17c9db36a4 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -51,7 +51,7 @@ public:
private:
virtual ~GCThread() {}
- virtual void execute() SAL_OVERRIDE;
+ virtual void execute() override;
PyObject *mPyObject;
PyInterpreterState *mPyInterpreter;
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 8be1183dc82f..2fb3a1b8e8e8 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -367,7 +367,7 @@ public:
// XInvocation
virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >
- SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Any SAL_CALL invoke(
const OUString& aFunctionName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
@@ -376,7 +376,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::script::CannotConvertException,
::com::sun::star::reflection::InvocationTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setValue(
const OUString& aPropertyName,
@@ -384,20 +384,20 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::script::CannotConvertException,
::com::sun::star::reflection::InvocationTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};