summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8')
-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
16 files changed, 46 insertions, 46 deletions
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