summaryrefslogtreecommitdiff
path: root/include/filter
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 /include/filter
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 'include/filter')
-rw-r--r--include/filter/msfilter/escherex.hxx20
-rw-r--r--include/filter/msfilter/msdffimp.hxx4
-rw-r--r--include/filter/msfilter/svdfppt.hxx2
3 files changed, 13 insertions, 13 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 16a5a71a0c7a..546d2d0eea6c 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1189,7 +1189,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
OUString mEditAs;
- virtual bool DoSeek( sal_uInt32 nKey );
+ bool DoSeek( sal_uInt32 nKey );
public:
explicit EscherEx( const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool bOOXML = false );
@@ -1214,7 +1214,7 @@ public:
/// If pPicStreamMergeBSE is known, the BLIPs from this stream are being
/// merged into the MsofbtBSE Records of the EscherStream like it's
/// required for Excel (and maybe Word?)
- virtual void Flush( SvStream* pPicStreamMergeBSE = NULL );
+ void Flush( SvStream* pPicStreamMergeBSE = NULL );
/** Inserts the passed number of bytes at the current position of the
output stream.
@@ -1240,7 +1240,7 @@ public:
void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset );
sal_uInt32 GetPersistOffset( sal_uInt32 nKey );
bool SeekToPersistOffset( sal_uInt32 nKey );
- virtual bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the
+ bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the
// current StreamPosition changes
void SetEditAs( const OUString& rEditAs );
rtl::OUString GetEditAs() { return mEditAs; }
@@ -1257,17 +1257,17 @@ public:
virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 );
virtual void CloseContainer();
- virtual void BeginAtom();
- virtual void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
- virtual void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
- virtual void AddChildAnchor( const Rectangle& rRectangle );
- virtual void AddClientAnchor( const Rectangle& rRectangle );
+ void BeginAtom();
+ void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
+ void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
+ void AddChildAnchor( const Rectangle& rRectangle );
+ void AddClientAnchor( const Rectangle& rRectangle );
virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 );
sal_uInt32 EnterGroup( const Rectangle* pBoundRect = NULL );
sal_uInt32 GetGroupLevel() const { return mnGroupLevel; };
- virtual bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
- virtual bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
+ bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
+ bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
virtual void LeaveGroup();
// a ESCHER_Sp is being written ( a ESCHER_DgContainer has to be opened for this purpose!)
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 71424e21d016..e6342f72d0df 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -483,14 +483,14 @@ protected :
const Rectangle& rVisArea );
// the following methods need to be overridden for Excel imports
- virtual bool ProcessClientAnchor( SvStream& rStData,
+ bool ProcessClientAnchor( SvStream& rStData,
sal_uInt32 nDatLen,
char*& rpBuff,
sal_uInt32& rBuffLen ) const;
virtual void ProcessClientAnchor2( SvStream& rStData,
DffRecordHeader& rHd,
void* pData, DffObjData& );
- virtual bool ProcessClientData( SvStream& rStData,
+ bool ProcessClientData( SvStream& rStData,
sal_uInt32 nDatLen,
char*& rpBuff,
sal_uInt32& rBuffLen ) const;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 9d72a6ea011e..9a78411390bb 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1320,7 +1320,7 @@ public :
mpPPTImporter ( pPPTImporter ),
mxInStrm ( rxInStrm )
{};
- virtual bool ReadOCXStream( SotStorageRef& rSrc1,
+ bool ReadOCXStream( SotStorageRef& rSrc1,
com::sun::star::uno::Reference<
com::sun::star::drawing::XShape > *pShapeRef=0,
bool bFloatingCtrl=false );