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

34 files changed, 56 insertions, 60 deletions

diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index dcc8c4c23689..8d7ae18633b2 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -183,7 +183,7 @@ protected:
 
      bool IsEditableState();
 
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL
+    ::com::sun::star::awt::Rectangle SAL_CALL
         getBoundsImpl(bool bRelative)
         throw (css::uno::RuntimeException, std::exception);
 
@@ -297,7 +297,7 @@ public:
     virtual void SAL_CALL grabFocus()
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+    ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
         throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getForeground()
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 8333c559be3d..7f630af8355e 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -48,8 +48,8 @@ public:
 
     void SetVisArea();
 
-    virtual void AddChild( vcl::Window *pWin, bool bFireEvent = true );
-    virtual void RemoveChild( vcl::Window *pWin );
+    void AddChild( vcl::Window *pWin, bool bFireEvent = true );
+    void RemoveChild( vcl::Window *pWin );
 
     // XAccessibleContext
 
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 87a4c5031d67..636389da14f3 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -68,7 +68,7 @@ namespace sw {
             virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE;
             virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE;
             virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE;
-            virtual bool hasMark(const OUString& rName) const;
+            bool hasMark(const OUString& rName) const;
 
             // bookmarks
             virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 4c0e16c6cfcc..b6f21ee293be 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -77,9 +77,9 @@ public:
     sal_uLong GetText( const OUString& rShort, OUString& );
 
     virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE;
-    virtual bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
-    virtual void SetIsTextOnly( const OUString& rShort, bool bNewValue );
-    virtual void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue );
+    bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
+    void SetIsTextOnly( const OUString& rShort, bool bNewValue );
+    void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue );
 
     virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl,
                                  bool bFileAlreadyOpen = false ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index d5bc95c9af24..f2891f4defab 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -80,7 +80,7 @@ namespace sw {
             virtual bool IsExpanded() const SAL_OVERRIDE
                 { return static_cast< bool >(m_pPos2); }
 
-            virtual void SetName(const OUString& rName)
+            void SetName(const OUString& rName)
                 { m_aName = rName; }
             virtual void SetMarkPos(const SwPosition& rNewPos);
             virtual void SetOtherMarkPos(const SwPosition& rNewPos);
@@ -89,7 +89,7 @@ namespace sw {
 
             virtual OUString ToString( ) const SAL_OVERRIDE;
 
-            virtual void Swap()
+            void Swap()
             {
                 if(m_pPos2)
                     m_pPos1.swap(m_pPos2);
@@ -252,7 +252,7 @@ namespace sw {
             bool IsChecked() const SAL_OVERRIDE;
             void SetChecked(bool checked) SAL_OVERRIDE;
 
-            virtual OUString toString( ) const;
+            OUString toString( ) const;
         };
     }
 }
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 0df443475a72..f103eca4db66 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -862,7 +862,7 @@ public:
 public:
     // if writer is NULL, dumps the layout structure as XML in layout.xml
     virtual void dumpAsXml(xmlTextWriterPtr writer = NULL) const;
-    virtual void dumpInfosAsXml(xmlTextWriterPtr writer) const;
+    void dumpInfosAsXml(xmlTextWriterPtr writer) const;
     virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const;
     void dumpChildrenAsXml(xmlTextWriterPtr writer) const;
     bool IsCollapse() const;
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 13b4527f5d74..aa589ff1ac94 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -78,7 +78,7 @@ class ObservableThread : public osl::Thread,
         */
         virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
 
-        virtual void threadFinished();
+        void threadFinished();
 
     private:
 
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 6d041dcbb4ca..e292b3bb0e0e 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -71,7 +71,7 @@ protected:
 
     ::sw::UnoImplPtr<Impl> m_pImpl;
 
-    virtual void SAL_CALL AttachImpl(
+    void SAL_CALL AttachImpl(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::text::XTextRange > & xTextRange,
             const sal_uInt16 nWhich)
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index d48156f3cc02..6b32e2dd0e7c 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -198,13 +198,13 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     //XTextContent
-    virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(  ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(  ) throw(::com::sun::star::uno::RuntimeException);
 
     //XComponent
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
+    void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
+    void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
+    void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
 
     //XUnoTunnel
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 4025583d9a61..51d540fb34d8 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -501,8 +501,8 @@ public:
     {
     }
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    void UndoImpl( ::sw::UndoRedoContext & );
+    void RedoImpl( ::sw::UndoRedoContext & );
 
     void SetEnd(SwPaM const& rPam);
 
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;
 };
 
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index d3c37d4d5a13..93492c6f7dcb 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -86,7 +86,7 @@ public:
 
     /** this method is called for every item that has the
         MID_SW_FLAG_NO_ITEM_EXPORT flag set */
-    virtual void handleNoItem( SvXMLAttributeList& rAttrList,
+    void handleNoItem( SvXMLAttributeList& rAttrList,
                                const SvXMLItemMapEntry& rEntry,
                                const SvXMLUnitConverter& rUnitConverter,
                                const SvXMLNamespaceMap& rNamespaceMap,
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index f1b4407b58ac..b68938cb3709 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -566,12 +566,8 @@ class SwNewUserIdxDlg : public ModalDialog
                 m_pNameED->GrabFocus();
             }
 
-    virtual void    Apply();
     OUString  GetName(){return m_pNameED->GetText();}
 };
-void SwNewUserIdxDlg::Apply()
-{
-}
 
 IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit*, pEdit)
 {
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index 6e0abdf74c22..a0a25380860c 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -39,7 +39,7 @@ public:
     SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
     virtual ~SwVbaApplication();
 
-    virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
 
     // XApplication
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 2a904386782b..860d8393d4d0 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -75,7 +75,7 @@ public:
     virtual ~PropertGetSetHelper() {}
     virtual uno::Any getPropertyValue( const OUString& rPropName ) = 0;
     virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) = 0;
-    virtual uno::Reference< beans::XPropertySet > getUserDefinedProperties() {
+    uno::Reference< beans::XPropertySet > getUserDefinedProperties() {
         return uno::Reference<beans::XPropertySet>(
                 m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
     }
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index f8c4fdb29329..0272508913dd 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -38,7 +38,7 @@ class SwVbaGlobals : public SwVbaGlobals_BASE
 private:
     css::uno::Reference< ooo::vba::word::XApplication > mxApplication;
 
-    virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException);
+    css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException);
 
 public:
 
diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx
index 58714a38b53b..e80e362925f2 100644
--- a/sw/source/ui/vba/vbatable.hxx
+++ b/sw/source/ui/vba/vbatable.hxx
@@ -37,7 +37,7 @@ public:
     virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL Select(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
     virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 790bc0009768..6be1c310a92a 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -28,7 +28,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField
     Link aActionLink;
 
 protected:
-    virtual void Action();
+    void Action();
     virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 public:
     NumEditAction( vcl::Window* pParent, const ResId& rResId ) :
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 2c603fef01b9..79273b06054b 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -198,7 +198,7 @@ public:
     virtual void    KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
 
     virtual bool    Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
-    virtual sal_Int32  GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const;
+    sal_Int32  GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const;
 
     using Control::Notify; // FIXME why do we have 2 of these
     virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ff049097c950..3866dbf723ef 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -295,7 +295,7 @@ public:
 
     SwEditWin(vcl::Window *pParent, SwView &);
     virtual ~SwEditWin();
-    virtual void SwitchView();
+    void SwitchView();
     /**
      * Notification about some region of the output device got invalidated.
      *
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 386213b74285..02c47361374f 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -115,7 +115,7 @@ class SwNavigationPI : public vcl::Window,
 
     void MakeVisible();
     void InitImageList();
-    virtual SfxChildAlignment
+    SfxChildAlignment
                     CheckAlignment(SfxChildAlignment,SfxChildAlignment);
     void SetPopupWindow( SfxPopupWindow* );
 
@@ -124,7 +124,7 @@ class SwNavigationPI : public vcl::Window,
 
 protected:
 
-    virtual         bool Close();
+            bool Close();
     virtual         void Resize() SAL_OVERRIDE;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index 57f2eaeef7a1..fd90c912c6c5 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.hxx
@@ -33,7 +33,7 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper
 
 protected:
     virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE;
-    virtual long DoubleClick(ToolBox *);
+    long DoubleClick(ToolBox *);
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index c5ccce1c80f4..2b2fa240a25c 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -141,7 +141,7 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
                     CreateAccessible() SAL_OVERRIDE;
-    virtual void SwitchView();
+    void SwitchView();
 };
 
 /**
@@ -236,7 +236,7 @@ public:
     void            DocSzChgd(const Size& rNewSize);
     const Size&     GetDocSz() const { return aDocSz; }
 
-    virtual void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
+    void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
 
     inline void     AdjustEditWin();
 
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 97cffe688fc2..7cffc0bb366a 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -129,7 +129,7 @@ public:
     void            Initialize(const OUString &rExtraData);
     void            FillInfo(OUString &rExtraData) const;
 
-    virtual void    Activate();
+    void    Activate();
 };
 
 class SwModelessRedlineAcceptDlg : public SfxModelessDialog
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 5b2226ff68ed..5fc129de1104 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -79,7 +79,7 @@ public:
     void GetNumFmt(size_t, SwNumFmt const*&, OUString const*&) const;
 };
 
-class SwChapterNumRules
+class SW_DLLPUBLIC SwChapterNumRules
 {
 public:
     enum { nMaxRules = MAX_NUM_RULES };         // currently 9 defined forms
@@ -95,7 +95,7 @@ public:
 
     inline const SwNumRulesWithName*    GetRules(sal_uInt16 nIdx) const;
     void CreateEmptyNumRule(sal_uInt16 nIdx); // for import
-    virtual void                        ApplyNumRules(
+    void                        ApplyNumRules(
                                                 const SwNumRulesWithName &rCopy,
                                                 sal_uInt16 nIdx);
 
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index fd27dba2c106..20cf95ffcd57 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -475,7 +475,7 @@ public:
 
     void    DocSzChgd( const Size& rNewSize );
     const   Size&   GetDocSz() const { return m_aDocSz; }
-    virtual void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
+    void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
             void    SetVisArea( const Point&, bool bUpdateScrollbar = true);
             void    CheckVisArea();