summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-20 12:38:10 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:28 +0200
commitb44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch)
tree9b4d5d99e5dad0971079b997a02a6d96536709ca /sdext
parent26ad60aec69310fecd918f1c2e09056aa4782320 (diff)
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
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/inc/pdfparse.hxx4
-rw-r--r--sdext/source/pdfimport/tree/genericelements.hxx16
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx4
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx10
4 files changed, 17 insertions, 17 deletions
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index b3f5653cf377..2fb3891b744e 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -162,8 +162,8 @@ struct PDFContainer : public PDFEntry
// entries that can contain sub elements besides comments
PDFContainer() : PDFEntry(), m_nOffset( 0 ) {}
virtual ~PDFContainer();
- virtual bool emitSubElements( EmitContext& rWriteContext ) const;
- virtual void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;
+ bool emitSubElements( EmitContext& rWriteContext ) const;
+ void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;
PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) const;
PDFObject* findObject( PDFObjectRef* pRef ) const
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index ae8e5f16e8d4..9ceabd68aedb 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -295,29 +295,29 @@ namespace pdfi
ElementFactory() {}
virtual ~ElementFactory();
- virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI )
+ HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI )
{ return new HyperlinkElement( pParent, rURI ); }
- virtual TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId )
+ TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId )
{ return new TextElement( pParent, nGCId, nFontId ); }
- virtual ParagraphElement* createParagraphElement( Element* pParent )
+ ParagraphElement* createParagraphElement( Element* pParent )
{ return new ParagraphElement( pParent ); }
- virtual FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId )
+ FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId )
{ return new FrameElement( pParent, nGCId ); }
- virtual PolyPolyElement*
+ PolyPolyElement*
createPolyPolyElement( Element* pParent,
sal_Int32 nGCId,
const basegfx::B2DPolyPolygon& rPolyPoly,
sal_Int8 nAction)
{ return new PolyPolyElement( pParent, nGCId, rPolyPoly, nAction ); }
- virtual ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage )
+ ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage )
{ return new ImageElement( pParent, nGCId, nImage ); }
- virtual PageElement* createPageElement( Element* pParent,
+ PageElement* createPageElement( Element* pParent,
sal_Int32 nPageNr )
{ return new PageElement( pParent, nPageNr ); }
- virtual DocumentElement* createDocumentElement()
+ DocumentElement* createDocumentElement()
{ return new DocumentElement(); }
};
}
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 19331e98e89f..76d86e3199b4 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -105,7 +105,7 @@ public:
/** On some occasions it is necessary to trigger the painting of a
scrollbar from the outside.
*/
- virtual void Paint (
+ void Paint (
const css::awt::Rectangle& rUpdateBox,
bool bNoClip = false);
@@ -188,7 +188,7 @@ protected:
SharedBitmapDescriptor mpThumbEndDescriptor;
bool maEnabledState[__AreaCount__];
- virtual css::geometry::RealRectangle2D GetRectangle (const Area eArea) const;
+ css::geometry::RealRectangle2D GetRectangle (const Area eArea) const;
virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0;
virtual void UpdateDragAnchor (const double nDragDistance) = 0;
virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 0b4a2452779a..442c89872b14 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -141,9 +141,9 @@ namespace {
const SharedElementMode& rpMouseOverMode,
const SharedElementMode& rpSelectedMode,
const SharedElementMode& rpDisabledMode);
- virtual void CurrentSlideHasChanged (void);
- virtual void SetLocation (const awt::Point& rLocation);
- virtual void SetSize (const geometry::RealSize2D& rSize);
+ void CurrentSlideHasChanged (void);
+ void SetLocation (const awt::Point& rLocation);
+ void SetSize (const geometry::RealSize2D& rSize);
virtual void Paint (
const Reference<rendering::XCanvas>& rxCanvas,
const rendering::ViewState& rViewState) = 0;
@@ -151,8 +151,8 @@ namespace {
const Reference<rendering::XCanvas>& rxCanvas);
awt::Rectangle GetBoundingBox (void) const;
virtual bool SetState (const bool bIsOver, const bool bIsPressed);
- virtual void Invalidate (const bool bSynchronous = true);
- virtual bool IsOutside (const awt::Rectangle& rBox);
+ void Invalidate (const bool bSynchronous = true);
+ bool IsOutside (const awt::Rectangle& rBox);
virtual bool IsFilling (void) const;
void UpdateState (void);