summaryrefslogtreecommitdiff
path: root/include/linguistic
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 /include/linguistic
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 'include/linguistic')
-rw-r--r--include/linguistic/hyphdta.hxx20
-rw-r--r--include/linguistic/lngprophelp.hxx30
-rw-r--r--include/linguistic/misc.hxx6
-rw-r--r--include/linguistic/spelldta.hxx14
4 files changed, 35 insertions, 35 deletions
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 34a75555b524..71aece26b929 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -53,22 +53,22 @@ public:
// XHyphenatedWord
virtual OUString SAL_CALL
getWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL
getHyphenationPos()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL
getHyphenatedWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL
getHyphenPos()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
isAlternativeSpelling()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
OUString GetWord() { return aWord; }
OUString GetHyphenatedWord() { return aHyphenatedWord; }
@@ -106,16 +106,16 @@ public:
// XPossibleHyphens
virtual OUString SAL_CALL
getWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL
getPossibleHyphens()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
getHyphenationPositions()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
OUString GetWord() { return aWord; }
sal_Int16 GetLanguage() { return nLanguage; }
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index af0ed99995b2..05e8d9d87e76 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -109,24 +109,24 @@ public:
// XEventListener
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& rSource )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL
addLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
removeLinguServiceEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// non-UNO functions
void LNG_DLLPUBLIC AddAsPropListener();
@@ -166,7 +166,7 @@ public:
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class LNG_DLLPUBLIC PropertyHelper_Thesaurus
@@ -212,10 +212,10 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
protected:
// PropertyChgHelper
- virtual void SetDefaultValues();
- virtual void GetCurrentValues();
+ virtual void SetDefaultValues() SAL_OVERRIDE;
+ virtual void GetCurrentValues() SAL_OVERRIDE;
virtual sal_Bool propertyChange_Impl(
- const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
+ const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE;
public:
PropertyHelper_Spell(
@@ -225,12 +225,12 @@ public:
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
virtual ~PropertyHelper_Spell();
- virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int16 GetDefaultNumberOfSuggestions() const;
@@ -294,10 +294,10 @@ class PropertyHelper_Hyphen :
protected:
// PropertyChgHelper
- virtual void SetDefaultValues();
- virtual void GetCurrentValues();
+ virtual void SetDefaultValues() SAL_OVERRIDE;
+ virtual void GetCurrentValues() SAL_OVERRIDE;
virtual sal_Bool propertyChange_Impl(
- const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
+ const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE;
public:
PropertyHelper_Hyphen(
@@ -307,12 +307,12 @@ public:
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
virtual ~PropertyHelper_Hyphen();
- virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+ virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int16 GetMinLeading() const { return nResHyphMinLeading; }
sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; }
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 1c1c47097f8a..277d298d1c4d 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -204,11 +204,11 @@ public:
void Deactivate();
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTerminateListener
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
} // namespace linguistic
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index 21f961cce40c..3aa5d1e18793 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -80,15 +80,15 @@ public:
virtual ~SpellAlternatives();
// XSpellAlternatives
- virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSetSpellAlternatives
- virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// non-interface specific functions
void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);