summaryrefslogtreecommitdiff
path: root/sw/source/filter
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 /sw/source/filter
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 'sw/source/filter')
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmltab.cxx8
-rw-r--r--sw/source/filter/html/svxcss1.hxx2
-rw-r--r--sw/source/filter/html/swcss1.hxx2
-rw-r--r--sw/source/filter/html/swhtml.hxx2
-rw-r--r--sw/source/filter/html/wrthtml.hxx2
-rw-r--r--sw/source/filter/inc/fltshell.hxx2
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx4
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/docxexport.hxx2
-rw-r--r--sw/source/filter/ww8/escher.hxx6
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx2
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx8
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx18
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx34
-rw-r--r--sw/source/filter/xml/wrtxml.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx2
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx8
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx10
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx4
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx2
-rw-r--r--sw/source/filter/xml/xmltbli.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.hxx2
-rw-r--r--sw/source/filter/xml/xmltext.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.hxx2
-rw-r--r--sw/source/filter/xml/xmltexti.hxx2
40 files changed, 86 insertions, 86 deletions
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index cf315afdceef..82d2b108f498 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.hxx
@@ -34,7 +34,7 @@ class SwASCWriter : public Writer
public:
SwASCWriter( const OUString& rFilterName );
- virtual ~SwASCWriter();
+ virtual ~SwASCWriter() override;
const OUString& GetLineEnd() const { return m_sLineEnd; }
};
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index af6abf1fbf76..6ef302379f81 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -372,7 +372,7 @@ class SwHTMLImageWatcher :
public:
SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape,
bool bWidth, bool bHeight );
- virtual ~SwHTMLImageWatcher();
+ virtual ~SwHTMLImageWatcher() override;
// startProduction darf nicht im Konstruktor gerufen werden, weil
// wir und ggf. selbst zerstoeren ... Deshlab eine eigene Methode.
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 398f845bb28b..f86f8625ed47 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2953,7 +2953,7 @@ public:
HTMLTable *m_pTable;
explicit SectionSaveStruct( SwHTMLParser& rParser );
- virtual ~SectionSaveStruct();
+ virtual ~SectionSaveStruct() override;
#if OSL_DEBUG_LEVEL > 0
size_t GetContextStAttrMin() const { return m_nContextStAttrMinSave; }
@@ -3055,7 +3055,7 @@ public:
CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd,
bool bReadOpt );
- virtual ~CellSaveStruct();
+ virtual ~CellSaveStruct() override;
void AddContents( HTMLTableCnts *pNewCnts );
HTMLTableCnts *GetFirstContents() { return pCnts; }
@@ -4727,7 +4727,7 @@ public:
rParser.GetNumInfo().Set( aNumRuleInfo );
}
- virtual ~CaptionSaveStruct();
+ virtual ~CaptionSaveStruct() override;
};
CaptionSaveStruct::~CaptionSaveStruct()
@@ -4932,7 +4932,7 @@ public:
m_pCurrentTable( pCurTable )
{}
- virtual ~TableSaveStruct();
+ virtual ~TableSaveStruct() override;
// Aufbau der Tabelle anstossen und die Tabelle ggf. in einen
// Rahmen packen. Wenn true zurueckgegeben wird muss noch ein
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 3088bbfd0f36..28327f6799a1 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -241,7 +241,7 @@ public:
SvxCSS1Parser( SfxItemPool& rPool,
const OUString& rBaseURL,
sal_uInt16 *pWhichIds=nullptr, sal_uInt16 nWhichIds=0 );
- virtual ~SvxCSS1Parser();
+ virtual ~SvxCSS1Parser() override;
bool IsIgnoreFontFamily() const { return bIgnoreFontFamily; }
void SetIgnoreFontFamily( bool bSet ) { bIgnoreFontFamily = bSet; }
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 428a76b8e8c9..13658429698a 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -73,7 +73,7 @@ protected:
public:
SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, bool bNewDoc );
- virtual ~SwCSS1Parser();
+ virtual ~SwCSS1Parser() override;
virtual bool ParseStyleSheet( const OUString& rIn ) override;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 6c85c945dbc4..204f51566a4d 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -877,7 +877,7 @@ public: // used in tables
protected:
// Executed for each token recognized by CallParser
virtual void NextToken( int nToken ) override;
- virtual ~SwHTMLParser();
+ virtual ~SwHTMLParser() override;
// If the document is removed, remove the parser as well
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index ec42ed36668b..4e9e73095b91 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -395,7 +395,7 @@ public:
// 25
explicit SwHTMLWriter( const OUString& rBaseURL );
- virtual ~SwHTMLWriter();
+ virtual ~SwHTMLWriter() override;
void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 90837a3efd5c..7ad69c20429c 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwFltAnchor : public SfxPoolItem
public:
SwFltAnchor(SwFrameFormat* pFlyFormat);
SwFltAnchor(const SwFltAnchor&);
- virtual ~SwFltAnchor();
+ virtual ~SwFltAnchor() override;
// "pure virtual Methoden" vom SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx
index a196b8560ecb..b47cdf6de2dd 100644
--- a/sw/source/filter/ww8/WW8FibData.hxx
+++ b/sw/source/filter/ww8/WW8FibData.hxx
@@ -30,7 +30,7 @@ class WW8FibData : public ::sw::ExternalData
public:
WW8FibData();
- virtual ~WW8FibData();
+ virtual ~WW8FibData() override;
void setReadOnlyRecommended(bool bReadOnlyRecommended);
void setWriteReservation(bool bWriteReservation);
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index e6f4cf23820c..179ae6acc1d3 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -41,7 +41,7 @@ namespace ww8
public:
WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize);
WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize);
- virtual ~WW8Struct();
+ virtual ~WW8Struct() override;
sal_uInt8 getU8(sal_uInt32 nOffset);
@@ -61,7 +61,7 @@ namespace ww8
public:
WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize);
- virtual ~WW8Sttb();
+ virtual ~WW8Sttb() override;
std::vector<OUString> & getStrings()
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index b392b694bfcf..6d69690777db 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -943,7 +943,7 @@ private:
public:
DocxAttributeOutput( DocxExport &rExport, ::sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML );
- virtual ~DocxAttributeOutput();
+ virtual ~DocxAttributeOutput() override;
/// Return the right export class.
virtual DocxExport& GetExport() override;
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index cbddb1820f4d..1b0b03b345d8 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -257,7 +257,7 @@ public:
SwPaM *pCurrentPam, SwPaM *pOriginalPam );
/// Destructor.
- virtual ~DocxExport();
+ virtual ~DocxExport() override;
/// Reference to the VMLExport instance for the main document.
oox::vml::VMLExport& VMLExporter() { return *m_pVMLExport; }
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 5b128fe42819..fa2f30dba168 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -77,7 +77,7 @@ class SwEscherExGlobal : public EscherExGlobal
{
public:
explicit SwEscherExGlobal();
- virtual ~SwEscherExGlobal();
+ virtual ~SwEscherExGlobal() override;
private:
/** Override to create a new memory stream for picture data. */
@@ -122,7 +122,7 @@ public:
void WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId);
virtual void WriteFrameExtraData(const SwFrameFormat&);
virtual void WritePictures();
- virtual ~SwBasicEscherEx();
+ virtual ~SwBasicEscherEx() override;
//i120927,this function is added to export hyperlink info,such as graphic/frame/OLE
bool IsRelUrl();
OUString GetBasePath();
@@ -162,7 +162,7 @@ private:
EscherPropertyContainer &rPropOpt) override;
public:
SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt );
- virtual ~SwEscherEx();
+ virtual ~SwEscherEx() override;
void FinishEscher();
virtual void WritePictures() override;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 073885a549e3..24dd7ea98c66 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -597,7 +597,7 @@ private:
public:
explicit RtfAttributeOutput(RtfExport& rExport);
- virtual ~RtfAttributeOutput();
+ virtual ~RtfAttributeOutput() override;
/// Return the right export class.
virtual MSWordExportBase& GetExport() override;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 1bb06580e788..a885d8e1d1ff 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1326,7 +1326,7 @@ private:
public:
SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL);
- virtual ~SwRTFWriter();
+ virtual ~SwRTFWriter() override;
virtual sal_uLong WriteStream() override;
};
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 8cb1883b8e18..d8341ce189d5 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -162,7 +162,7 @@ public:
bool bOutOutlineOnly = false);
/// Destructor.
- virtual ~RtfExport();
+ virtual ~RtfExport() override;
rtl_TextEncoding m_eDefaultEncoding;
rtl_TextEncoding m_eCurrentEncoding;
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 81c6a25ec634..d1896a742238 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -48,7 +48,7 @@ protected:
css::uno::Reference<css::lang::XComponent> m_xSrcDoc;
public:
explicit RtfExportFilter(const css::uno::Reference<css::uno::XComponentContext>& xCtx);
- virtual ~RtfExportFilter();
+ virtual ~RtfExportFilter() override;
// XFilter
virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 32341407eb1c..a6cb56ef2f07 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -58,7 +58,7 @@ class RtfSdrExport : public EscherEx
public:
explicit RtfSdrExport(RtfExport& rExport);
- virtual ~RtfSdrExport();
+ virtual ~RtfSdrExport() override;
/// Export the sdr object as Sdr.
///
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index add0656e5a03..426c5d25145a 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -243,7 +243,7 @@ class WW8_WrPlcSepx : public MSWordSections
public:
explicit WW8_WrPlcSepx( MSWordExportBase& rExport );
- virtual ~WW8_WrPlcSepx();
+ virtual ~WW8_WrPlcSepx() override;
virtual bool HeaderFooterWritten() override; // override
@@ -893,7 +893,7 @@ friend void WW8_WrtRedlineAuthor::Write(Writer &rWrt);
public:
SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL);
- virtual ~SwWW8Writer();
+ virtual ~SwWW8Writer() override;
virtual sal_uLong WriteStorage() override;
virtual sal_uLong WriteMedium( SfxMedium& ) override;
@@ -1108,7 +1108,7 @@ public:
WW8Export( SwWW8Writer *pWriter,
SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam,
bool bDot );
- virtual ~WW8Export();
+ virtual ~WW8Export() override;
virtual void DoComboBox(const OUString &rName,
const OUString &rHelp,
@@ -1217,7 +1217,7 @@ private:
std::map<const OUString, WW8_CP> m_aRangeStartPositions;
public:
WW8_WrPlcAnnotations() {}
- virtual ~WW8_WrPlcAnnotations();
+ virtual ~WW8_WrPlcAnnotations() override;
void AddRangeStartPosition(const OUString& rName, WW8_CP nStartCp);
void Append( WW8_CP nCp, const SwPostItField* pPostIt );
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 4ff8bf4d8aa6..22229fd93cf7 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -469,7 +469,7 @@ public:
{
}
- virtual ~WW8AttributeOutput() {}
+ virtual ~WW8AttributeOutput() override {}
/// Return the right export class.
virtual WW8Export& GetExport() override { return m_rWW8Export; }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 88bcf07ab55a..ad9f65143dfb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -457,7 +457,7 @@ struct SBBItem
public:
Sttb();
- virtual ~Sttb();
+ virtual ~Sttb() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* fp ) override;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 2d0fe6f0e6ba..a8b344d0fd4d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -504,7 +504,7 @@ class SwMacroInfo : public SdrObjUserData
{
public:
SwMacroInfo();
- virtual ~SwMacroInfo();
+ virtual ~SwMacroInfo() override;
virtual SdrObjUserData* Clone( SdrObject* pObj ) const override;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 3395747643e9..cafc1f549801 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -454,7 +454,7 @@ private:
public:
WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
WW8_CP nStartCp, bool bVer67P);
- virtual ~WW8PLCFx_PCD();
+ virtual ~WW8PLCFx_PCD() override;
sal_uLong GetIMax() const;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nI ) override;
@@ -591,7 +591,7 @@ protected:
public:
WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL );
- virtual ~WW8PLCFx_Fc_FKP();
+ virtual ~WW8PLCFx_Fc_FKP() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nIdx ) override;
virtual bool SeekPos(WW8_FC nFcPos) override;
@@ -622,7 +622,7 @@ private:
public:
WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
const WW8ScannerBase& rBase, ePLCFT ePl );
- virtual ~WW8PLCFx_Cp_FKP();
+ virtual ~WW8PLCFx_Cp_FKP() override;
void ResetAttrStartEnd();
sal_uLong GetPCDIMax() const;
sal_uLong GetPCDIdx() const;
@@ -654,7 +654,7 @@ private:
public:
WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib,
WW8_CP nStartCp );
- virtual ~WW8PLCFx_SEPX();
+ virtual ~WW8PLCFx_SEPX() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nIdx ) override;
virtual bool SeekPos(WW8_CP nCpPos) override;
@@ -682,7 +682,7 @@ private:
public:
WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
long nFcRef, long nLenRef, long nFcText, long nLenText, long nStruc = 0);
- virtual ~WW8PLCFx_SubDoc();
+ virtual ~WW8PLCFx_SubDoc() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nIdx ) override;
virtual bool SeekPos(WW8_CP nCpPos) override;
@@ -710,7 +710,7 @@ private:
public:
WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
- virtual ~WW8PLCFx_FLD();
+ virtual ~WW8PLCFx_FLD() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nIdx ) override;
virtual bool SeekPos(WW8_CP nCpPos) override;
@@ -740,7 +740,7 @@ private:
public:
WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib);
- virtual ~WW8PLCFx_Book();
+ virtual ~WW8PLCFx_Book() override;
long GetIMax() const { return nIMax; }
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nI ) override;
@@ -778,7 +778,7 @@ private:
public:
WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib);
- virtual ~WW8PLCFx_AtnBook();
+ virtual ~WW8PLCFx_AtnBook() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx( sal_uLong nI ) override;
virtual sal_uLong GetIdx2() const override;
@@ -808,7 +808,7 @@ private:
public:
WW8PLCFx_FactoidBook(SvStream* pTableSt,const WW8Fib& rFib);
- virtual ~WW8PLCFx_FactoidBook();
+ virtual ~WW8PLCFx_FactoidBook() override;
virtual sal_uInt32 GetIdx() const override;
virtual void SetIdx(sal_uLong nI) override;
virtual sal_uLong GetIdx2() const override;
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 75cfb29e0880..870102503c44 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -35,7 +35,7 @@ class SwTBC : public TBBase
public:
SwTBC();
- virtual ~SwTBC();
+ virtual ~SwTBC() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -61,7 +61,7 @@ class SwCTB : public TBBase
public:
SwCTB();
- virtual ~SwCTB();
+ virtual ~SwCTB() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* fp ) override;
@@ -85,7 +85,7 @@ class TBDelta : public TBBase
public:
TBDelta();
- virtual ~TBDelta(){}
+ virtual ~TBDelta() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -109,7 +109,7 @@ protected:
public:
explicit Tcg255SubStruct( bool bReadId );
- virtual ~Tcg255SubStruct(){}
+ virtual ~Tcg255SubStruct() override {}
sal_uInt8 id() const { return ch; }
bool Read(SvStream &rS) override;
};
@@ -130,7 +130,7 @@ class Customization : public TBBase
public:
explicit Customization( SwCTBWrapper* rapper );
- virtual ~Customization();
+ virtual ~Customization() override;
bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& );
@@ -164,7 +164,7 @@ class SwCTBWrapper : public Tcg255SubStruct
public:
explicit SwCTBWrapper( bool bReadId = true );
- virtual ~SwCTBWrapper();
+ virtual ~SwCTBWrapper() override;
void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
bool Read(SvStream &rS) override;
@@ -223,7 +223,7 @@ class Acd : public TBBase
public:
Acd();
- virtual ~Acd(){}
+ virtual ~Acd() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -239,7 +239,7 @@ class PlfAcd: public Tcg255SubStruct
public:
explicit PlfAcd( bool bReadId = true );
- virtual ~PlfAcd();
+ virtual ~PlfAcd() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print(FILE*) override;
@@ -260,7 +260,7 @@ class Kme : public TBBase
public:
Kme();
- virtual ~Kme();
+ virtual ~Kme() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -276,7 +276,7 @@ class PlfKme : public Tcg255SubStruct
public:
explicit PlfKme( bool bReadId = true );
- virtual ~PlfKme();
+ virtual ~PlfKme() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -302,7 +302,7 @@ class TcgSttbfCore : public TBBase
public:
TcgSttbfCore();
- virtual ~TcgSttbfCore();
+ virtual ~TcgSttbfCore() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* fp ) override;
@@ -317,7 +317,7 @@ class TcgSttbf : public Tcg255SubStruct
public:
explicit TcgSttbf( bool bReadId = true );
- virtual ~TcgSttbf(){}
+ virtual ~TcgSttbf() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* fp ) override;
@@ -334,7 +334,7 @@ class Xstz : public TBBase
public:
Xstz();
- virtual ~Xstz(){}
+ virtual ~Xstz() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* fp ) override;
@@ -350,7 +350,7 @@ class MacroName : public TBBase
public:
MacroName();
- virtual ~MacroName(){}
+ virtual ~MacroName() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -367,7 +367,7 @@ class MacroNames : public Tcg255SubStruct
public:
explicit MacroNames( bool bReadId = true );
- virtual ~MacroNames();
+ virtual ~MacroNames() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -383,7 +383,7 @@ class Tcg255 : public TBBase
public:
Tcg255();
- virtual ~Tcg255();
+ virtual ~Tcg255() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -400,7 +400,7 @@ class Tcg: public TBBase
public:
Tcg();
- virtual ~Tcg(){}
+ virtual ~Tcg() override {}
bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 7bae60a0cd3b..913e3b846c3d 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -49,7 +49,7 @@ protected:
public:
SwXMLWriter( const OUString& rBaseURL );
- virtual ~SwXMLWriter();
+ virtual ~SwXMLWriter() override;
virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ) override;
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 56fef7456e51..7a507ddc5902 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -60,7 +60,7 @@ public:
const SvXMLUnitConverter& rUnitConv,
sal_uInt16 nWhich );
- virtual ~SwXMLBrushItemImportContext();
+ virtual ~SwXMLBrushItemImportContext() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 0469227db681..b08682d961b5 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -113,7 +113,7 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlags);
- virtual ~SwXMLExport();
+ virtual ~SwXMLExport() override;
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 09920b1e4398..7b963963ae6a 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -203,7 +203,7 @@ public:
SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
- virtual ~SwXMLConditionContext_Impl();
+ virtual ~SwXMLConditionContext_Impl() override;
bool IsValid() const { return 0 != nCondition; }
@@ -425,7 +425,7 @@ public:
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
SvXMLStylesContext& rStylesC,
sal_uInt16 nFamily);
- virtual ~SwXMLItemSetStyleContext_Impl();
+ virtual ~SwXMLItemSetStyleContext_Impl() override;
virtual void CreateAndInsert( bool bOverwrite ) override;
@@ -713,7 +713,7 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
bool bAuto );
- virtual ~SwXMLStylesContext_Impl();
+ virtual ~SwXMLStylesContext_Impl() override;
virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
@@ -921,7 +921,7 @@ public:
SwXMLImport& rImport,
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
- virtual ~SwXMLMasterStylesContext_Impl();
+ virtual ~SwXMLMasterStylesContext_Impl() override;
virtual void EndElement() override;
};
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f019c04ada59..7bc0c33081df 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -266,7 +266,7 @@ protected:
public:
explicit SwXMLAutoStylePoolP( SvXMLExport& rExport );
- virtual ~SwXMLAutoStylePoolP();
+ virtual ~SwXMLAutoStylePoolP() override;
};
void SwXMLAutoStylePoolP::exportStyleAttributes(
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index b76d6788365f..341154e71b82 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -125,7 +125,7 @@ public:
SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
- virtual ~SwXMLBodyContext_Impl();
+ virtual ~SwXMLBodyContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
@@ -168,7 +168,7 @@ public:
SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
- virtual ~SwXMLDocContext_Impl();
+ virtual ~SwXMLDocContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
@@ -256,7 +256,7 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
const Reference< document::XDocumentProperties >& xDocProps);
- virtual ~SwXMLOfficeDocContext_Impl();
+ virtual ~SwXMLOfficeDocContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext(
@@ -318,7 +318,7 @@ public:
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
- virtual ~SwXMLDocStylesContext_Impl();
+ virtual ~SwXMLDocStylesContext_Impl() override;
virtual void EndElement() override;
@@ -941,7 +941,7 @@ class SvTextShapeImportHelper : public XMLTextShapeImportHelper
public:
explicit SvTextShapeImportHelper(SvXMLImport& rImp);
- virtual ~SvTextShapeImportHelper();
+ virtual ~SvTextShapeImportHelper() override;
};
SvTextShapeImportHelper::SvTextShapeImportHelper(SvXMLImport& rImp) :
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 4d202791a9d7..17a54b99ab9f 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -119,7 +119,7 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags);
- virtual ~SwXMLImport() throw();
+ virtual ~SwXMLImport() throw() override;
// css::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index b927d0427235..34276bee4538 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -46,7 +46,7 @@ public:
SvXMLImportItemMapper& rIMap,
const SvXMLUnitConverter& rUnitConv );
- virtual ~SvXMLItemSetContext();
+ virtual ~SvXMLItemSetContext() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 04c1fad8b193..482ef650df05 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -68,7 +68,7 @@ public:
SvXMLItemMapEntriesRef rMapEntries,
SwXMLExport& rExp );
- virtual ~SwXMLTableItemMapper_Impl();
+ virtual ~SwXMLTableItemMapper_Impl() override;
virtual void handleSpecialItem( SvXMLAttributeList& rAttrList,
const SvXMLItemMapEntry& rEntry,
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 97d7962fcf4c..42c26d2d391f 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -63,7 +63,7 @@ class SwXMLImportTableItemMapper_Impl: public SvXMLImportItemMapper
public:
explicit SwXMLImportTableItemMapper_Impl(SvXMLItemMapEntriesRef rMapEntries);
- virtual ~SwXMLImportTableItemMapper_Impl();
+ virtual ~SwXMLImportTableItemMapper_Impl() override;
virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry,
SfxPoolItem& rItem,
@@ -254,7 +254,7 @@ public:
SfxItemSet& rItemSet,
SvXMLImportItemMapper & rIMapper,
const SvXMLUnitConverter& rUnitConv );
- virtual ~SwXMLItemSetContext_Impl();
+ virtual ~SwXMLItemSetContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 53f48c566a9d..abba74e887c5 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -63,7 +63,7 @@ protected:
public:
explicit SvXMLItemMapEntries(SvXMLItemMapEntry* pEntrys);
- virtual ~SvXMLItemMapEntries();
+ virtual ~SvXMLItemMapEntries() override;
SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace,
const OUString& rString ) const;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index ea99b369ac24..57e1bd635fbd 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -427,7 +427,7 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
- virtual ~SwXMLTableCellContext_Impl();
+ virtual ~SwXMLTableCellContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -747,7 +747,7 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
- virtual ~SwXMLTableColContext_Impl();
+ virtual ~SwXMLTableColContext_Impl() override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -833,7 +833,7 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
- virtual ~SwXMLTableColsContext_Impl();
+ virtual ~SwXMLTableColsContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -890,7 +890,7 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable, bool bInHead=false );
- virtual ~SwXMLTableRowContext_Impl();
+ virtual ~SwXMLTableRowContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -1011,7 +1011,7 @@ public:
SwXMLTableContext *pTable,
bool bHead );
- virtual ~SwXMLTableRowsContext_Impl();
+ virtual ~SwXMLTableRowsContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -1071,7 +1071,7 @@ public:
SwXMLDDETableContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName);
- virtual ~SwXMLDDETableContext_Impl();
+ virtual ~SwXMLDDETableContext_Impl() override;
virtual void StartElement(
const Reference<xml::sax::XAttributeList> & xAttrList) override;
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index d05002253c04..da26c301be68 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -137,7 +137,7 @@ public:
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
- virtual ~SwXMLTableContext();
+ virtual ~SwXMLTableContext() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 58fea1d5a9a9..8b4e15e36e6a 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -31,7 +31,7 @@ class SwXMLBodyContentContext_Impl : public SvXMLImportContext
public:
SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName );
- virtual ~SwXMLBodyContentContext_Impl();
+ virtual ~SwXMLBodyContentContext_Impl() override;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index e714994fbf38..9f4ab283574e 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -60,7 +60,7 @@ public:
SwXMLTextParagraphExport(
SwXMLExport& rExp,
SvXMLAutoStylePoolP& rAutoStylePool );
- virtual ~SwXMLTextParagraphExport();
+ virtual ~SwXMLTextParagraphExport() override;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 327bc42f4751..f4ae970673aa 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -42,7 +42,7 @@ public:
bool bInsertM, bool bStylesOnlyM,
bool bBlockM, bool bOrganizerM,
bool bPreserveRedlineFlags );
- virtual ~SwXMLTextImportHelper();
+ virtual ~SwXMLTextImportHelper() override;
virtual css::uno::Reference<css::beans::XPropertySet>
createAndInsertOLEObject( SvXMLImport& rImport,