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 /hwpfilter | |
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 'hwpfilter')
-rw-r--r-- | hwpfilter/source/hbox.h | 8 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.h | 6 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.hxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 1ae07fd974bc..aa00c862c2c6 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -52,7 +52,7 @@ struct HBox /** * @returns The Size of HBox object */ - virtual int WSize(); + int WSize(); /** * @returns The Height of HBox object as hunit value. */ @@ -383,12 +383,12 @@ struct TxtBox: public FBox /** * @returns Count of cell. */ - virtual int NCell() { return nCell; } + int NCell() { return nCell; } /** * This is one of table, text-box, equalizer and button * @returns Type of this object. */ - virtual int Type() { return type; } + int Type() { return type; } virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; @@ -660,7 +660,7 @@ struct Picture: public FBox Picture(); virtual ~Picture(); - virtual int Type (); + int Type (); virtual bool Read (HWPFile &hwpf) SAL_OVERRIDE; virtual hunit Height (CharShape *sty) SAL_OVERRIDE; diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h index a47de8f095bc..def45bbed51c 100644 --- a/hwpfilter/source/hiodev.h +++ b/hwpfilter/source/hiodev.h @@ -58,9 +58,9 @@ class DLLEXPORT HIODev virtual int readBlock( void *ptr, int size ) = 0; virtual int skipBlock( int size ) = 0; - virtual int read1b( void *ptr, int nmemb ); - virtual int read2b( void *ptr, int nmemb ); - virtual int read4b( void *ptr, int nmemb ); + int read1b( void *ptr, int nmemb ); + int read2b( void *ptr, int nmemb ); + int read4b( void *ptr, int nmemb ); }; struct gz_stream; diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index a4c5d8d19ee1..e10c02877395 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -86,7 +86,7 @@ public: */ virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler) + void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler) { m_rxDocumentHandler = xHandler; } |