diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /hwpfilter | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'hwpfilter')
-rw-r--r-- | hwpfilter/qa/cppunit/test_hwpfilter.cxx | 4 | ||||
-rw-r--r-- | hwpfilter/source/attributes.hxx | 12 | ||||
-rw-r--r-- | hwpfilter/source/hbox.h | 60 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.h | 49 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.hxx | 18 |
5 files changed, 76 insertions, 67 deletions
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index 8d707e569bb7..70b2079b7bc3 100644 --- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx +++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx @@ -24,11 +24,11 @@ namespace , public test::BootstrapFixture { public: - virtual void setUp(); + virtual void setUp() SAL_OVERRIDE; virtual bool load(const OUString &, const OUString &rURL, const OUString &, - unsigned int, unsigned int, unsigned int); + unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; void test(); diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx index c56592de3b8d..f9a5284f8118 100644 --- a/hwpfilter/source/attributes.hxx +++ b/hwpfilter/source/attributes.hxx @@ -46,12 +46,12 @@ public: AttributeListImpl( const AttributeListImpl & ); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 0dc7076a6b59..5bf64da321ad 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -20,8 +20,12 @@ #ifndef _HBOX_H_ #define _HBOX_H_ +#include <sal/config.h> + #include <list> +#include <sal/types.h> + #include "hwplib.h" #include "hwpfile.h" #include "hinfo.h" @@ -77,7 +81,7 @@ struct SkipData: public HBox SkipData(hchar); virtual ~SkipData(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; struct DateCode; struct FieldCode : public HBox @@ -95,7 +99,7 @@ struct FieldCode : public HBox FieldCode(); virtual ~FieldCode(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /** * Kind of BOOKMARK @@ -120,7 +124,7 @@ struct Bookmark: public HBox Bookmark(); virtual ~Bookmark(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // date format(7) @@ -135,7 +139,7 @@ struct DateFormat: public HBox hchar dummy; DateFormat(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /** @@ -157,9 +161,9 @@ struct DateCode: public HBox unsigned char key; DateCode(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; - virtual hchar_string GetString(); + virtual hchar_string GetString() SAL_OVERRIDE; }; /** @@ -172,7 +176,7 @@ struct Tab: public HBox hchar dummy; Tab(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // tbox(10) TABLE BOX MATH BUTTON HYPERTEXT @@ -385,9 +389,9 @@ struct TxtBox: public FBox */ virtual int Type() { return type; } - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; - virtual hunit Height(CharShape *csty); + virtual hunit Height(CharShape *csty) SAL_OVERRIDE; }; #define ALLOWED_GAP 5 @@ -657,9 +661,9 @@ struct Picture: public FBox virtual ~Picture(); virtual int Type (); - virtual bool Read (HWPFile &hwpf); + virtual bool Read (HWPFile &hwpf) SAL_OVERRIDE; - virtual hunit Height (CharShape *sty); + virtual hunit Height (CharShape *sty) SAL_OVERRIDE; }; // line (14) @@ -678,7 +682,7 @@ struct Line: public FBox Line(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // hidden(15) @@ -696,7 +700,7 @@ struct Hidden: public HBox Hidden(); virtual ~Hidden(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /** @@ -725,7 +729,7 @@ struct HeaderFooter: public HBox HeaderFooter(); virtual ~HeaderFooter(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /** @@ -758,7 +762,7 @@ struct Footnote: public HBox Footnote(); virtual ~Footnote(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // auto number(18) @@ -786,7 +790,7 @@ struct AutoNum: public HBox AutoNum(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /** @@ -800,7 +804,7 @@ struct NewNum: public HBox NewNum(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // page numger(20) @@ -822,7 +826,7 @@ struct ShowPageNum: public HBox ShowPageNum(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /* Ȧʽ (21) */ @@ -847,7 +851,7 @@ struct PageNumCtrl: public HBox PageNumCtrl(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // mail merge(22) @@ -862,8 +866,8 @@ struct MailMerge: public HBox MailMerge(); - virtual bool Read(HWPFile &hwpf); - virtual hchar_string GetString(); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual hchar_string GetString() SAL_OVERRIDE; }; // char compositon(23) @@ -878,7 +882,7 @@ struct Compose: public HBox Compose(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // hyphen(24) @@ -895,7 +899,7 @@ struct Hyphen: public HBox Hyphen(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // toc mark(25) @@ -911,7 +915,7 @@ struct TocMark: public HBox TocMark(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // index mark(26) @@ -929,7 +933,7 @@ struct IndexMark: public HBox IndexMark(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; // outline(28) @@ -1000,7 +1004,7 @@ class Outline: public HBox Outline(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; hchar_string GetUnicode() const; }; @@ -1016,7 +1020,7 @@ struct KeepSpace: public HBox KeepSpace(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; /* ĭ(31) */ @@ -1029,7 +1033,7 @@ struct FixedSpace: public HBox FixedSpace(); - virtual bool Read(HWPFile &hwpf); + virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; }; #endif /* _HBOX_H_ */ diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h index ac0ded73bde7..1bc920fec424 100644 --- a/hwpfilter/source/hiodev.h +++ b/hwpfilter/source/hiodev.h @@ -25,7 +25,12 @@ #ifndef _HIODEV_H_ #define _HIODEV_H_ +#include <sal/config.h> + #include <stdio.h> + +#include <sal/types.h> + #include "hwplib.h" /** * @short Abstract IO class @@ -77,51 +82,51 @@ class HStreamIODev : public HIODev /** * Check whether the stream is available */ - virtual bool open(); + virtual bool open() SAL_OVERRIDE; /** * Free stream object */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** * If the stream is gzipped, flush the stream. */ - virtual void flush(); + virtual void flush() SAL_OVERRIDE; /** * Not implemented. */ - virtual int state() const; + virtual int state() const SAL_OVERRIDE; /** * Set whether the stream is compressed or not */ - virtual bool setCompressed( bool ); + virtual bool setCompressed( bool ) SAL_OVERRIDE; /** * Read one byte from stream */ using HIODev::read1b; - virtual int read1b(); + virtual int read1b() SAL_OVERRIDE; /** * Read 2 bytes from stream */ using HIODev::read2b; - virtual int read2b(); + virtual int read2b() SAL_OVERRIDE; /** * Read 4 bytes from stream */ using HIODev::read4b; - virtual long read4b(); + virtual long read4b() SAL_OVERRIDE; /** * Read some bytes from stream to given pointer as amount of size */ - virtual int readBlock( void *ptr, int size ); + virtual int readBlock( void *ptr, int size ) SAL_OVERRIDE; /** * Move current pointer of stream as amount of size */ - virtual int skipBlock( int size ); + virtual int skipBlock( int size ) SAL_OVERRIDE; protected: /** * Initialize this object */ - virtual void init(); + virtual void init() SAL_OVERRIDE; }; /* ġ */ @@ -137,22 +142,22 @@ class HMemIODev : public HIODev HMemIODev(char *s, int len); virtual ~HMemIODev(); - virtual bool open(); - virtual void close(); - virtual void flush(); - virtual int state() const; + virtual bool open() SAL_OVERRIDE; + virtual void close() SAL_OVERRIDE; + virtual void flush() SAL_OVERRIDE; + virtual int state() const SAL_OVERRIDE; /* gzip routine wrapper */ - virtual bool setCompressed( bool ); + virtual bool setCompressed( bool ) SAL_OVERRIDE; using HIODev::read1b; - virtual int read1b(); + virtual int read1b() SAL_OVERRIDE; using HIODev::read2b; - virtual int read2b(); + virtual int read2b() SAL_OVERRIDE; using HIODev::read4b; - virtual long read4b(); - virtual int readBlock( void *ptr, int size ); - virtual int skipBlock( int size ); + virtual long read4b() SAL_OVERRIDE; + virtual int readBlock( void *ptr, int size ) SAL_OVERRIDE; + virtual int skipBlock( int size ) SAL_OVERRIDE; protected: - virtual void init(); + virtual void init() SAL_OVERRIDE; }; #endif /* _HIODEV_H_*/ diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index 52934e383654..3eb537cbec2e 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -85,8 +85,8 @@ public: /** * parseStream does Parser-startup initializations */ - virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) {} + 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) { m_rxDocumentHandler = xHandler; @@ -167,20 +167,20 @@ public: public: // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) - throw( RuntimeException, std::exception ); - virtual void SAL_CALL cancel() throw(RuntimeException, std::exception); + throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc) - throw( IllegalArgumentException, RuntimeException, std::exception ); + throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo - OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XExtendedFilterDetection - virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: Reference< XFilter > rFilter; |