summaryrefslogtreecommitdiff
path: root/include/linguistic
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 /include/linguistic
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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 af0cb3bd54c2..7c5f7fe19571 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -52,22 +52,22 @@ public:
// XHyphenatedWord
virtual OUString SAL_CALL
getWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL
getHyphenationPos()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL
getHyphenatedWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL
getHyphenPos()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
isAlternativeSpelling()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
@@ -98,16 +98,16 @@ public:
// XPossibleHyphens
virtual OUString SAL_CALL
getWord()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL
getPossibleHyphens()
- 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_Int16 > SAL_CALL
getHyphenationPositions()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
(const OUString &rWord, sal_Int16 nLang,
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index ce8c6b73bca3..2ac4aff1560c 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -107,24 +107,24 @@ public:
// XEventListener
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& rSource )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// non-UNO functions
void LNG_DLLPUBLIC AddAsPropListener();
@@ -160,7 +160,7 @@ public:
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
class LNG_DLLPUBLIC PropertyHelper_Thesaurus
@@ -204,10 +204,10 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
protected:
// PropertyChgHelper
- virtual void SetDefaultValues() SAL_OVERRIDE;
- virtual void GetCurrentValues() SAL_OVERRIDE;
+ virtual void SetDefaultValues() override;
+ virtual void GetCurrentValues() override;
virtual bool propertyChange_Impl(
- const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE;
+ const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
public:
PropertyHelper_Spell(
@@ -217,12 +217,12 @@ public:
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet );
virtual ~PropertyHelper_Spell();
- virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE;
+ virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
@@ -284,10 +284,10 @@ class PropertyHelper_Hyphen :
protected:
// PropertyChgHelper
- virtual void SetDefaultValues() SAL_OVERRIDE;
- virtual void GetCurrentValues() SAL_OVERRIDE;
+ virtual void SetDefaultValues() override;
+ virtual void GetCurrentValues() override;
virtual bool propertyChange_Impl(
- const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE;
+ const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) override;
public:
PropertyHelper_Hyphen(
@@ -297,12 +297,12 @@ public:
::com::sun::star::linguistic2::XLinguProperties > &rxPropSet);
virtual ~PropertyHelper_Hyphen();
- virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE;
+ virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) override;
// XPropertyChangeListener
virtual void SAL_CALL
propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) 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 386e04d0053e..d746e0421864 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -195,11 +195,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) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE;
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ 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) override;
+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
} // namespace linguistic
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index 02257297dc17..fe381384d7f5 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) 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;
+ virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XSetSpellAlternatives
- 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;
+ virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// non-interface specific functions
void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);