new loplugin: change virtual methods to non-virtual

Where we can prove that the virtual method is never overriden.

In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.

Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae

9 files changed, 18 insertions, 18 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 3916eb32fa6e..1b3d5556663b 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -214,7 +214,7 @@ public:
 
     virtual void OnTOXEnding() {}
 
-    virtual void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr );
+    void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr );
 
     /// Output redlining.
     virtual void Redline( const SwRedlineData* pRedline ) = 0;
@@ -487,7 +487,7 @@ protected:
     void TextField( const SwFmtFld& );
 
     /// Sfx item RES_TXTATR_FLYCNT
-    virtual void TextFlyContent( const SwFmtFlyCnt& );
+    void TextFlyContent( const SwFmtFlyCnt& );
 
     /// Sfx item RES_TXTATR_FTN
     ///
@@ -653,7 +653,7 @@ public:
     virtual void BulletDefinition(int /*nId*/, const Graphic& /*rGraphic*/, Size /*aSize*/) {}
 
     // Returns whether or not the 'SwTxtNode' has a paragraph marker inserted \ deleted (using 'track changes')
-    virtual const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType );
+    const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType );
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index a5e13d9d07f5..d0ddd2f36d22 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -231,7 +231,7 @@ public:
     virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
     virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
     virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
-    virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
+    void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
     virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
     virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
     virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index f2a320e04eee..0f1c655c0bd8 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -111,7 +111,7 @@ public:
     virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
 
     /// Access to the derived attribute output class.
-    virtual DocxAttributeOutput& DocxAttrOutput() const;
+    DocxAttributeOutput& DocxAttrOutput() const;
 
     /// Access to the sections/headers/footres.
     virtual MSWordSections& Sections() const SAL_OVERRIDE;
@@ -186,13 +186,13 @@ protected:
     virtual void ExportDocument_Impl() SAL_OVERRIDE;
 
     /// Output page/section breaks
-    virtual void OutputPageSectionBreaks( const SwTxtNode& );
+    void OutputPageSectionBreaks( const SwTxtNode& );
 
     /// Output SwEndNode
     virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE;
 
     /// Output SwTableNode
-    virtual void OutputTableNode( const SwTableNode& );
+    void OutputTableNode( const SwTableNode& );
 
     /// Output SwGrfNode
     virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 582903a60412..1653cd62e5ca 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -36,7 +36,7 @@ public:
     // For now, let's just do empty implementations of those.
     virtual bool        importDocument() SAL_OVERRIDE { return false; }
     virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
-    virtual sal_Int32   getSchemeClr( sal_Int32 ) const { return 0; }
+    sal_Int32   getSchemeClr( sal_Int32 ) const { return 0; }
     virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; }
     virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; }
     virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return ::oox::drawingml::table::TableStyleListPtr(); }
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 44c5c37260ec..0ee6485cdf86 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -58,7 +58,7 @@ public:
     virtual MSWordSections& Sections() const SAL_OVERRIDE;
 
     /// Access to the Rtf Sdr exporter.
-    virtual RtfSdrExport& SdrExporter() const;
+    RtfSdrExport& SdrExporter() const;
 
     /// Determines if the format is expected to support unicode.
     virtual bool SupportsUnicode() const SAL_OVERRIDE
@@ -105,7 +105,7 @@ public:
     virtual void WriteNumbering() SAL_OVERRIDE;
 
     /// Write the revision table.
-    virtual void WriteRevTab();
+    void WriteRevTab();
 
     /// Output the actual headers and footers.
     virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 2e405b083486..12d22fb14fca 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -787,10 +787,10 @@ protected:
     virtual void ExportDocument_Impl() = 0;
 
     /// Get the next position in the text node to output
-    virtual sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos );
+    sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos );
 
     /// Update the information for GetNextPos().
-    virtual void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd );
+    void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd );
 
     /// Output SwTxtNode
     virtual void OutputTextNode( const SwTxtNode& );
@@ -819,7 +819,7 @@ protected:
     virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) = 0;
 
     /// Output SwStartNode
-    virtual void OutputStartNode( const SwStartNode& );
+    void OutputStartNode( const SwStartNode& );
 
     /// Output SwEndNode
     virtual void OutputEndNode( const SwEndNode& );
@@ -833,7 +833,7 @@ protected:
     virtual void OutputLinkedOLE( const OUString& ) = 0;
 
     /// Output SwSectionNode
-    virtual void OutputSectionNode( const SwSectionNode& );
+    void OutputSectionNode( const SwSectionNode& );
 
     virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) = 0;
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d6954ac02be6..da3610bb6e37 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -743,14 +743,14 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls
 {
 public:
     SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
-    virtual bool InsertFormula( WW8FormulaControl &rFormula);
+    bool InsertFormula( WW8FormulaControl &rFormula);
     virtual bool InsertControl(const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& rFComp,
         const ::com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference <
         com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE;
     bool ExportControl(WW8Export &rWrt, const SdrObject *pObj);
-    virtual bool ReadOCXStream( SotStorageRef& rSrc1,
+    bool ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShapeRef=0,
         bool bFloatingCtrl=false );
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 642a56a00ce0..b114e92e838f 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -452,7 +452,7 @@ public:
     WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
         WW8_CP nStartCp, bool bVer67P);
     virtual ~WW8PLCFx_PCD();
-    virtual sal_uLong GetIMax() const;
+    sal_uLong GetIMax() const;
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
     virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
     virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 82e1ab2db060..4e7a4fc88af0 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -112,7 +112,7 @@ protected:
 public:
     Tcg255SubStruct( bool bReadId );
     virtual ~Tcg255SubStruct(){}
-    virtual sal_uInt8 id() const { return ch; }
+    sal_uInt8 id() const { return ch; }
     bool Read(SvStream &rS) SAL_OVERRIDE;
 };