summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /i18npool
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
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/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/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
25 files changed, 25 insertions, 25 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 8c71ec54f7a6..b43adbf24b23 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -48,7 +48,7 @@ class BreakIteratorImpl : public cppu::WeakImplHelper2
public:
BreakIteratorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
BreakIteratorImpl();
- ~BreakIteratorImpl();
+ virtual ~BreakIteratorImpl();
virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 3396cdfb67a1..dce0f5562391 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 (); \
- ~BreakIterator_##lang (); \
+ virtual ~BreakIterator_##lang (); \
};
#ifdef BREAKITERATOR_ALL
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 0baee89af9e6..6c9e840757da 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();
- ~BreakIterator_CTL();
+ virtual ~BreakIterator_CTL();
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(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 806bb62aa455..cee1b52292e6 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();
- ~BreakIterator_th();
+ virtual ~BreakIterator_th();
protected:
void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 88802c89153f..3f78120e97b2 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();
- ~BreakIterator_Unicode();
+ virtual ~BreakIterator_Unicode();
virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 063f960f49dd..4bbdc5fa62a4 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -49,7 +49,7 @@ public:
/**
* Destructor
*/
- ~CalendarImpl();
+ virtual ~CalendarImpl();
// Methods
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index e6a89828b028..da071da4fffa 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -53,7 +53,7 @@ public:
/**
* Destructor
*/
- ~Calendar_gregorian();
+ virtual ~Calendar_gregorian();
// Methods in XCalendar
virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index c2f43a20d22f..98c8d14eca1a 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -40,7 +40,7 @@ class cclass_Unicode : public cppu::WeakImplHelper2 < XCharacterClassification,
{
public:
cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
- ~cclass_Unicode();
+ virtual ~cclass_Unicode();
virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 4866bb6362a5..96807c497dfa 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -33,7 +33,7 @@ public:
// Constructors
ChapterCollator( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
// Destructor
- ~ChapterCollator();
+ virtual ~ChapterCollator();
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index d32b48ed7fd1..d6a0f369f56c 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -45,7 +45,7 @@ public:
// Constructors
CollatorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
// Destructor
- ~CollatorImpl();
+ virtual ~CollatorImpl();
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(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index bbc7f02ef802..934b9b7dd728 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -39,7 +39,7 @@ public:
// Constructors
Collator_Unicode();
// Destructor
- ~Collator_Unicode();
+ virtual ~Collator_Unicode();
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 9c9a9985e3ea..713e54463807 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -46,7 +46,7 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper4
public:
DefaultNumberingProvider(
const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
- ~DefaultNumberingProvider();
+ virtual ~DefaultNumberingProvider();
//XDefaultNumberingProvider
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 251c92955e2d..2f6afd1283e3 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 com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
- ~IndexEntrySupplier_asian();
+ virtual ~IndexEntrySupplier_asian();
OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm )
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index d48767e37ca1..cc9c2df4a671 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -39,7 +39,7 @@ class IndexEntrySupplier_Common : public cppu::WeakImplHelper2
{
public:
IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
- ~IndexEntrySupplier_Common();
+ virtual ~IndexEntrySupplier_Common();
virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 4c69e0a981cf..bae7c492443c 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 com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
- ~IndexEntrySupplier_Unicode();
+ virtual ~IndexEntrySupplier_Unicode();
virtual sal_Bool SAL_CALL loadAlgorithm(
const com::sun::star::lang::Locale& rLocale,
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index d9e027adf772..8fe3601cdbd5 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -41,7 +41,7 @@ class InputSequenceCheckerImpl : public cppu::WeakImplHelper2
public:
InputSequenceCheckerImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
InputSequenceCheckerImpl(const char *pServiceName);
- ~InputSequenceCheckerImpl();
+ virtual ~InputSequenceCheckerImpl();
virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index ae70fa86d63d..0b854f0caf81 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();
- ~InputSequenceChecker_hi();
+ virtual ~InputSequenceChecker_hi();
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index c0acec0eb3b6..ec03fe315538 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();
- ~InputSequenceChecker_th();
+ virtual ~InputSequenceChecker_th();
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 1bfd22ee6166..fccbd4ae61a6 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -70,7 +70,7 @@ class LocaleDataImpl : public cppu::WeakImplHelper2
{
public:
LocaleDataImpl();
- ~LocaleDataImpl();
+ virtual ~LocaleDataImpl();
static com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem > downcastCalendarItems( const com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > & rCi );
static com::sun::star::i18n::Calendar downcastCalendar( const com::sun::star::i18n::Calendar2 & rC );
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index db54d3b43aca..c4461db877d1 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -38,7 +38,7 @@ class NumberFormatCodeMapper : public cppu::WeakImplHelper2
public:
NumberFormatCodeMapper( const ::com::sun::star::uno::Reference <
::com::sun::star::uno::XComponentContext >& rxContext );
- ~NumberFormatCodeMapper();
+ virtual ~NumberFormatCodeMapper();
virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 927a76608e03..6bea259341c8 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
- ~TextToPronounce_zh();
+ virtual ~TextToPronounce_zh();
OUString SAL_CALL
folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset)
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 8d2189a2356d..aff4181ed52e 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -41,7 +41,7 @@ class TextConversion: public cppu::WeakImplHelper2
{
public:
TextConversion(const char* pImplName);
- ~TextConversion();
+ virtual ~TextConversion();
// Methods
virtual com::sun::star::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 00ed73d541a3..e318f87b6f45 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -46,7 +46,7 @@ public:
// Constructors
TransliterationImpl(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& xContext);
// Destructor
- ~TransliterationImpl();
+ virtual ~TransliterationImpl();
// Methods
virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 0df1835a844a..f38362666b43 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1371,7 +1371,7 @@ class OutlineNumbering : public cppu::WeakImplHelper1 < container::XIndexAccess
sal_Int16 m_nCount;
public:
OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlineLevels, int nLevels);
- ~OutlineNumbering();
+ virtual ~OutlineNumbering();
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 5a68c5201499..d3647aa6bf56 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -166,7 +166,7 @@ public:
theLocale[sizeof(theLocale)-1] = 0;
}
- ~TestDocumentHandler( )
+ virtual ~TestDocumentHandler( )
{
of.closeOutput();
delete rootNode;