summaryrefslogtreecommitdiff
path: root/stoc/source/javavm
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /stoc/source/javavm
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'stoc/source/javavm')
-rw-r--r--stoc/source/javavm/interact.cxx4
-rw-r--r--stoc/source/javavm/interact.hxx4
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/javavm/javavm.hxx30
4 files changed, 20 insertions, 20 deletions
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index f4d033020b43..e51d2782ad50 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -38,7 +38,7 @@ class AbortContinuation:
public:
inline AbortContinuation() {}
- virtual inline void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) {}
+ virtual inline void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
private:
AbortContinuation(AbortContinuation &); // not implemented
@@ -55,7 +55,7 @@ class InteractionRequest::RetryContinuation:
public:
inline RetryContinuation(): m_bSelected(false) {}
- virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
bool isSelected() const;
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 609dffaaf13b..94b4a782b18a 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -40,11 +40,11 @@ public:
explicit InteractionRequest(com::sun::star::uno::Any const & rRequest);
virtual com::sun::star::uno::Any SAL_CALL getRequest()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
com::sun::star::task::XInteractionContinuation > > SAL_CALL
- getContinuations() throw (com::sun::star::uno::RuntimeException, std::exception);
+ getContinuations() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
bool retry() const;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 1418b9b73ace..36fd069f60b2 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -134,7 +134,7 @@ private:
virtual inline ~SingletonFactory() {}
virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static void dispose();
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index d5bff2400b1d..df9745031467 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -69,56 +69,56 @@ public:
virtual void SAL_CALL
initialize(com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
rArguments)
- throw (com::sun::star::uno::Exception, std::exception);
+ throw (com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
supportsService(OUString const & rServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
+ getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XJavaVM
virtual com::sun::star::uno::Any SAL_CALL
getJavaVM(com::sun::star::uno::Sequence< sal_Int8 > const & rProcessId)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isVMStarted()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isVMEnabled()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XJavaThreadRegister_11
virtual sal_Bool SAL_CALL isThreadAttached()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL registerThread()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL revokeThread()
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XContainerListener
virtual void SAL_CALL
disposing(com::sun::star::lang::EventObject const & rSource)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
elementInserted(com::sun::star::container::ContainerEvent const & rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
elementRemoved(com::sun::star::container::ContainerEvent const & rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
elementReplaced(com::sun::star::container::ContainerEvent const & rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
JavaVirtualMachine(JavaVirtualMachine &); // not implemented
@@ -126,7 +126,7 @@ private:
virtual ~JavaVirtualMachine();
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
JavaVM * createJavaVM(JVM const & jvm, JNIEnv ** pMainThreadEnv);
// throws com::sun::star::uno::RuntimeException