diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /include/oox | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (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 'include/oox')
-rw-r--r-- | include/oox/core/filterdetect.hxx | 4 | ||||
-rw-r--r-- | include/oox/crypto/CryptoEngine.hxx | 2 | ||||
-rw-r--r-- | include/oox/drawingml/shape.hxx | 2 | ||||
-rw-r--r-- | include/oox/dump/dffdumper.hxx | 2 | ||||
-rw-r--r-- | include/oox/dump/dumperbase.hxx | 6 | ||||
-rw-r--r-- | include/oox/export/chartexport.hxx | 2 | ||||
-rw-r--r-- | include/oox/export/shapes.hxx | 30 | ||||
-rw-r--r-- | include/oox/ole/axcontrol.hxx | 6 | ||||
-rw-r--r-- | include/oox/ole/vbaproject.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/dgmimport.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/dgmlayout.hxx | 2 |
11 files changed, 30 insertions, 30 deletions
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index e46340c4f7c0..6a8a44eb3404 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -66,8 +66,8 @@ public: virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); private: void parseRelationship( const AttributeList& rAttribs ); diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx index 1f9f0d129b45..ed7cd697ca9c 100644 --- a/include/oox/crypto/CryptoEngine.hxx +++ b/include/oox/crypto/CryptoEngine.hxx @@ -31,7 +31,7 @@ public: virtual ~CryptoEngine() {} - virtual std::vector<sal_uInt8>& getKey() + std::vector<sal_uInt8>& getKey() { return mKey; } diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 73357bae4a07..e3ccce306d52 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -223,7 +223,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase ); - virtual OUString finalizeServiceName( + OUString finalizeServiceName( ::oox::core::XmlFilterBase& rFilter, const OUString& rServiceName, const ::com::sun::star::awt::Rectangle& rShapeRect ); diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 25683ea14aa8..257642fe8d3c 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -44,7 +44,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; virtual void implWriteExtHeader() SAL_OVERRIDE; virtual void implDumpRecordBody() SAL_OVERRIDE; - virtual void implDumpClientAnchor(); + void implDumpClientAnchor(); private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 9a89f0ae5973..e055832c2445 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -963,8 +963,8 @@ protected: const OUString& rSysFileName ); virtual bool implIsValid() const SAL_OVERRIDE; - virtual const OUString* implGetOption( const OUString& rKey ) const; - virtual NameListRef implGetNameList( const OUString& rListName ) const; + const OUString* implGetOption( const OUString& rKey ) const; + NameListRef implGetNameList( const OUString& rListName ) const; private: typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; @@ -1734,7 +1734,7 @@ public: protected: virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; - virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); + void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index b76811df6376..668e9a197cfc 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -187,7 +187,7 @@ public: sal_Int32 GetChartID( ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel(){ return mxChartModel; } - virtual ChartExport& WriteChartObj( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, sal_Int32 nChartCount ); + ChartExport& WriteChartObj( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, sal_Int32 nChartCount ); void ExportContent(); void InitRangeSegmentationProperties( diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index fb93a1022e5d..516220029e47 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -83,29 +83,29 @@ public: static bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface ); - virtual ShapeExport& + ShapeExport& WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, bool bClosed ); - virtual ShapeExport& + ShapeExport& WriteClosedBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteConnectorShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteCustomShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteEllipseShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteGraphicObjectShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteGroupShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteLineShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteNonVisualDrawingProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, const char* sName ); virtual ShapeExport& WriteNonVisualProperties( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteOpenBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteRectangleShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); /** @@ -145,15 +145,15 @@ public: * @param xShape The shape to export as DrawingML. * @return <tt>*this</tt> */ - virtual ShapeExport& + ShapeExport& WriteShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteTextBox( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface, sal_Int32 nXmlNamespace ); virtual ShapeExport& WriteTextShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteTableShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual ShapeExport& + ShapeExport& WriteOLE2Shape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ShapeExport& WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 397a379f7574..282d3a0e40bf 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -406,8 +406,8 @@ public: protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; - virtual void importCommonExtraData( BinaryInputStream& rInStrm ); - virtual void importCommonTrailingData( BinaryInputStream& rInStrm ); + void importCommonExtraData( BinaryInputStream& rInStrm ); + void importCommonTrailingData( BinaryInputStream& rInStrm ); private: /** Returns the data part identifier according to the model version. */ @@ -886,7 +886,7 @@ public: explicit AxMultiPageModel(); virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); + bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; std::vector<sal_uInt32> mnIDs; sal_uInt32 mnActiveTab; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 0bfd244d04d6..0c996acfd999 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -152,7 +152,7 @@ protected: /** Called when the import process of the VBA project has been started. */ virtual void prepareImport(); /** Called when the import process of the VBA project is finished. */ - virtual void finalizeImport(); + void finalizeImport(); private: VbaProject( const VbaProject& ); diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 3efad8bcd677..0591f5e2aec3 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -44,7 +44,7 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; + sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 52dcfbd05981..74c7186ff96c 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -44,7 +44,7 @@ public: virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; + sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; |