summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /i18npool
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/inc/breakiteratorImpl.hxx2
-rw-r--r--i18npool/inc/breakiterator_cjk.hxx2
-rw-r--r--i18npool/inc/breakiterator_ctl.hxx2
-rw-r--r--i18npool/inc/breakiterator_th.hxx2
-rw-r--r--i18npool/inc/breakiterator_unicode.hxx2
-rw-r--r--i18npool/inc/calendarImpl.hxx2
-rw-r--r--i18npool/inc/calendar_gregorian.hxx2
-rw-r--r--i18npool/inc/cclass_unicode.hxx2
-rw-r--r--i18npool/inc/chaptercollator.hxx2
-rw-r--r--i18npool/inc/characterclassificationImpl.hxx2
-rw-r--r--i18npool/inc/collatorImpl.hxx2
-rw-r--r--i18npool/inc/collator_unicode.hxx2
-rw-r--r--i18npool/inc/defaultnumberingprovider.hxx2
-rw-r--r--i18npool/inc/indexentrysupplier_asian.hxx2
-rw-r--r--i18npool/inc/indexentrysupplier_common.hxx2
-rw-r--r--i18npool/inc/indexentrysupplier_default.hxx2
-rw-r--r--i18npool/inc/inputsequencechecker.hxx2
-rw-r--r--i18npool/inc/inputsequencechecker_hi.hxx2
-rw-r--r--i18npool/inc/inputsequencechecker_th.hxx2
-rw-r--r--i18npool/inc/localedata.hxx2
-rw-r--r--i18npool/inc/numberformatcode.hxx2
-rw-r--r--i18npool/inc/ordinalsuffix.hxx2
-rw-r--r--i18npool/inc/textToPronounce_zh.hxx2
-rw-r--r--i18npool/inc/textconversion.hxx2
-rw-r--r--i18npool/inc/transliterationImpl.hxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx2
-rw-r--r--i18npool/source/localedata/saxparser.cxx2
-rw-r--r--i18npool/source/search/textsearch.hxx2
28 files changed, 28 insertions, 28 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 82547e32fc11..77b4d33190b9 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -48,7 +48,7 @@ class BreakIteratorImpl : public cppu::WeakImplHelper
public:
BreakIteratorImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
BreakIteratorImpl();
- virtual ~BreakIteratorImpl();
+ virtual ~BreakIteratorImpl() override;
virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index a477558f7bee..8731745385c6 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -54,7 +54,7 @@ protected:
class BreakIterator_##lang : public BreakIterator_CJK {\
public:\
BreakIterator_##lang (); \
- virtual ~BreakIterator_##lang (); \
+ virtual ~BreakIterator_##lang () override; \
};
BREAKITERATOR_CJK( zh )
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 7715a2e3e50a..e9498a82b8f7 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -31,7 +31,7 @@ class BreakIterator_CTL : public BreakIterator_Unicode
{
public:
BreakIterator_CTL();
- virtual ~BreakIterator_CTL();
+ virtual ~BreakIterator_CTL() override;
virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
sal_Int32& nDone) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index dccafea9c24f..943c8f33cabb 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -29,7 +29,7 @@ class BreakIterator_th : public BreakIterator_CTL
{
public:
BreakIterator_th();
- virtual ~BreakIterator_th();
+ virtual ~BreakIterator_th() override;
protected:
void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException) override;
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 22bcbb751797..ffcb4fe44d1b 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -37,7 +37,7 @@ class BreakIterator_Unicode : public BreakIteratorImpl
{
public:
BreakIterator_Unicode();
- virtual ~BreakIterator_Unicode();
+ virtual ~BreakIterator_Unicode() override;
virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 286972e4b7be..8cca72220ff7 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -49,7 +49,7 @@ public:
/**
* Destructor
*/
- virtual ~CalendarImpl();
+ virtual ~CalendarImpl() override;
// Methods
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 283e1b7c60e9..98f48bc1e0e6 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -54,7 +54,7 @@ public:
/**
* Destructor
*/
- virtual ~Calendar_gregorian();
+ virtual ~Calendar_gregorian() override;
// Methods in XCalendar
virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index cbcb6f9baaa7..122e1ee7136b 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -39,7 +39,7 @@ class cclass_Unicode : public cppu::WeakImplHelper < XCharacterClassification, c
{
public:
cclass_Unicode(const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~cclass_Unicode();
+ virtual ~cclass_Unicode() override;
virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 57adfd27e228..863e408598e0 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -33,7 +33,7 @@ public:
// Constructors
ChapterCollator( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
// Destructor
- virtual ~ChapterCollator();
+ virtual ~ChapterCollator() override;
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index b775e10a7110..d0d8f29a1142 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -37,7 +37,7 @@ class CharacterClassificationImpl : public cppu::WeakImplHelper
public:
CharacterClassificationImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~CharacterClassificationImpl();
+ virtual ~CharacterClassificationImpl() override;
virtual OUString SAL_CALL toUpper( const OUString& Text,
sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale )
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index f9b135c964db..e1e7c5b4ea09 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -45,7 +45,7 @@ public:
// Constructors
CollatorImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
// Destructor
- virtual ~CollatorImpl();
+ virtual ~CollatorImpl() override;
virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1,
const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 38522a5d96c3..ac76c215295a 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -38,7 +38,7 @@ public:
// Constructors
Collator_Unicode();
// Destructor
- virtual ~Collator_Unicode();
+ virtual ~Collator_Unicode() override;
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 4e72d3014bc6..d65ef5e6c29a 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -43,7 +43,7 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper
public:
DefaultNumberingProvider(
const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~DefaultNumberingProvider();
+ virtual ~DefaultNumberingProvider() override;
//XDefaultNumberingProvider
virtual css::uno::Sequence< css::uno::Reference<
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 8f68dfc63b06..1ae075046314 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
class IndexEntrySupplier_asian : public IndexEntrySupplier_Common {
public:
IndexEntrySupplier_asian( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~IndexEntrySupplier_asian();
+ virtual ~IndexEntrySupplier_asian() override;
OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
const css::lang::Locale& rLocale, const OUString& rAlgorithm )
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index aab4a4c5668e..cf3120b36276 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -39,7 +39,7 @@ class IndexEntrySupplier_Common : public cppu::WeakImplHelper
{
public:
IndexEntrySupplier_Common( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~IndexEntrySupplier_Common();
+ virtual ~IndexEntrySupplier_Common() override;
virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 79934b2016d3..49b35580e3f4 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -31,7 +31,7 @@ class Index;
class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common {
public:
IndexEntrySupplier_Unicode( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~IndexEntrySupplier_Unicode();
+ virtual ~IndexEntrySupplier_Unicode() override;
virtual sal_Bool SAL_CALL loadAlgorithm(
const css::lang::Locale& rLocale,
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 953aa9d2faca..b89d4061e0e5 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -41,7 +41,7 @@ class InputSequenceCheckerImpl : public cppu::WeakImplHelper
public:
InputSequenceCheckerImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
InputSequenceCheckerImpl(const char *pServiceName);
- virtual ~InputSequenceCheckerImpl();
+ virtual ~InputSequenceCheckerImpl() override;
virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 27938f4591fc..dbbe12129a4d 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -33,7 +33,7 @@ class InputSequenceChecker_hi : public InputSequenceCheckerImpl
{
public:
InputSequenceChecker_hi();
- virtual ~InputSequenceChecker_hi();
+ virtual ~InputSequenceChecker_hi() override;
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index bf1ede02348f..8c288ec511f8 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -30,7 +30,7 @@ class InputSequenceChecker_th : public InputSequenceCheckerImpl
{
public:
InputSequenceChecker_th();
- virtual ~InputSequenceChecker_th();
+ virtual ~InputSequenceChecker_th() override;
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index c36e71175864..ae33218583d3 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -67,7 +67,7 @@ class LocaleDataImpl : public cppu::WeakImplHelper
{
public:
LocaleDataImpl();
- virtual ~LocaleDataImpl();
+ virtual ~LocaleDataImpl() override;
static rtl::Reference<LocaleDataImpl> get() { return new LocaleDataImpl; }
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 9c7d78066d3e..62261f2e550d 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -38,7 +38,7 @@ class NumberFormatCodeMapper : public cppu::WeakImplHelper
public:
NumberFormatCodeMapper( const css::uno::Reference <
css::uno::XComponentContext >& rxContext );
- virtual ~NumberFormatCodeMapper();
+ virtual ~NumberFormatCodeMapper() override;
virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index f87f5b87b2bc..a62c28bef6d6 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -36,7 +36,7 @@ class OrdinalSuffixService : public cppu::WeakImplHelper
{
public:
OrdinalSuffixService();
- virtual ~OrdinalSuffixService();
+ virtual ~OrdinalSuffixService() override;
// XOrdinalSuffix
virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index a428fdd378d4..ed33fad20e51 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -39,7 +39,7 @@ public:
#else
TextToPronounce_zh(sal_uInt16 ** (*function)());
#endif
- virtual ~TextToPronounce_zh();
+ virtual ~TextToPronounce_zh() override;
OUString SAL_CALL
folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset)
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 6071cdfc1a4d..5b1670b03c15 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -41,7 +41,7 @@ class TextConversionService: public cppu::WeakImplHelper
{
public:
TextConversionService(const char* pImplName);
- virtual ~TextConversionService();
+ virtual ~TextConversionService() override;
// Methods
virtual css::i18n::TextConversionResult SAL_CALL
getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 21ffd6c03a56..7714ac3c5b52 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -38,7 +38,7 @@ public:
// Constructors
TransliterationImpl(const css::uno::Reference < css::uno::XComponentContext >& xContext);
// Destructor
- virtual ~TransliterationImpl();
+ virtual ~TransliterationImpl() override;
// Methods
virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override ;
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 5c7d4f8100f9..99a865e181cd 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1328,7 +1328,7 @@ class OutlineNumbering : public cppu::WeakImplHelper < container::XIndexAccess >
sal_Int16 m_nCount;
public:
OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlineLevels, int nLevels);
- virtual ~OutlineNumbering();
+ virtual ~OutlineNumbering() override;
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index f367a5d50ea1..26da63a5e69c 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -160,7 +160,7 @@ public:
theLocale[sizeof(theLocale)-1] = 0;
}
- virtual ~TestDocumentHandler( )
+ virtual ~TestDocumentHandler( ) override
{
of.closeOutput();
delete rootNode;
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 49c1dfb24fef..5ed122b73dd5 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -130,7 +130,7 @@ public:
explicit TextSearch(
const css::uno::Reference < css::uno::XComponentContext >& rxContext );
- virtual ~TextSearch();
+ virtual ~TextSearch() override;
// XTextSearch
virtual void SAL_CALL