diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /hwpfilter | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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 | 52 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.h | 52 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.hxx | 18 |
5 files changed, 69 insertions, 69 deletions
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index d4fe8363fb0a..65cc9acfe737 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() SAL_OVERRIDE; + virtual void setUp() override; virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; void test(); diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx index e762579c7031..c4025044bbea 100644 --- a/hwpfilter/source/attributes.hxx +++ b/hwpfilter/source/attributes.hxx @@ -45,12 +45,12 @@ public: AttributeListImpl( const AttributeListImpl & ); public: - virtual sal_Int16 SAL_CALL getLength() 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; + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException, std::exception) 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 3bac8f5e272a..921e63105e24 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -77,7 +77,7 @@ struct SkipData: public HBox SkipData(hchar); virtual ~SkipData(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; struct DateCode; struct FieldCode : public HBox @@ -95,7 +95,7 @@ struct FieldCode : public HBox FieldCode(); virtual ~FieldCode(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /** * Kind of BOOKMARK @@ -120,7 +120,7 @@ struct Bookmark: public HBox Bookmark(); virtual ~Bookmark(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // date format(7) @@ -135,7 +135,7 @@ struct DateFormat: public HBox hchar dummy; DateFormat(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /** @@ -157,9 +157,9 @@ struct DateCode: public HBox unsigned char key; DateCode(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; - virtual hchar_string GetString() SAL_OVERRIDE; + virtual hchar_string GetString() override; }; /** @@ -172,7 +172,7 @@ struct Tab: public HBox hchar dummy; Tab(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // tbox(10) TABLE BOX MATH BUTTON HYPERTEXT @@ -386,7 +386,7 @@ struct TxtBox: public FBox */ int Type() { return type; } - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; #define ALLOWED_GAP 5 @@ -655,7 +655,7 @@ struct Picture: public FBox virtual ~Picture(); int Type (); - virtual bool Read (HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read (HWPFile &hwpf) override; }; // line (14) @@ -674,7 +674,7 @@ struct Line: public FBox Line(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // hidden(15) @@ -692,7 +692,7 @@ struct Hidden: public HBox Hidden(); virtual ~Hidden(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /** @@ -721,7 +721,7 @@ struct HeaderFooter: public HBox HeaderFooter(); virtual ~HeaderFooter(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /** @@ -754,7 +754,7 @@ struct Footnote: public HBox Footnote(); virtual ~Footnote(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // auto number(18) @@ -782,7 +782,7 @@ struct AutoNum: public HBox AutoNum(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /** @@ -796,7 +796,7 @@ struct NewNum: public HBox NewNum(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // page number(20) @@ -818,7 +818,7 @@ struct ShowPageNum: public HBox ShowPageNum(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /* Start odd side (21) */ @@ -839,7 +839,7 @@ struct PageNumCtrl: public HBox PageNumCtrl(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // mail merge(22) @@ -854,8 +854,8 @@ struct MailMerge: public HBox MailMerge(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; - virtual hchar_string GetString() SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; + virtual hchar_string GetString() override; }; // char compositon(23) @@ -870,7 +870,7 @@ struct Compose: public HBox Compose(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // hyphen(24) @@ -887,7 +887,7 @@ struct Hyphen: public HBox Hyphen(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // toc mark(25) @@ -903,7 +903,7 @@ struct TocMark: public HBox TocMark(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // index mark(26) @@ -921,7 +921,7 @@ struct IndexMark: public HBox IndexMark(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; // outline(28) @@ -992,7 +992,7 @@ class Outline: public HBox Outline(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; hchar_string GetUnicode() const; }; @@ -1008,7 +1008,7 @@ struct KeepSpace: public HBox KeepSpace(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; /* Fixed-width spaces (31) */ @@ -1021,7 +1021,7 @@ struct FixedSpace: public HBox FixedSpace(); - virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE; + virtual bool Read(HWPFile &hwpf) override; }; #endif // INCLUDED_HWPFILTER_SOURCE_HBOX_H diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h index 7df035a59b4d..ebc94b2b8b7c 100644 --- a/hwpfilter/source/hiodev.h +++ b/hwpfilter/source/hiodev.h @@ -85,53 +85,53 @@ class HStreamIODev : public HIODev /** * Check whether the stream is available */ - virtual bool open() SAL_OVERRIDE; + virtual bool open() override; /** * Free stream object */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** * If the stream is gzipped, flush the stream. */ - virtual void flush() SAL_OVERRIDE; + virtual void flush() override; /** * Not implemented. */ - virtual int state() const SAL_OVERRIDE; + virtual int state() const override; /** * Set whether the stream is compressed or not */ - virtual bool setCompressed( bool ) SAL_OVERRIDE; + virtual bool setCompressed( bool ) override; /** * Read one byte from stream */ using HIODev::read1b; - virtual bool read1b(unsigned char &out) SAL_OVERRIDE; - virtual bool read1b(char &out) SAL_OVERRIDE; + virtual bool read1b(unsigned char &out) override; + virtual bool read1b(char &out) override; /** * Read 2 bytes from stream */ using HIODev::read2b; - virtual bool read2b(unsigned short &out) SAL_OVERRIDE; + virtual bool read2b(unsigned short &out) override; /** * Read 4 bytes from stream */ using HIODev::read4b; - virtual bool read4b(unsigned int &out) SAL_OVERRIDE; - virtual bool read4b(int &out) SAL_OVERRIDE; + virtual bool read4b(unsigned int &out) override; + virtual bool read4b(int &out) override; /** * Read some bytes from stream to given pointer as amount of size */ - virtual int readBlock( void *ptr, int size ) SAL_OVERRIDE; + virtual int readBlock( void *ptr, int size ) override; /** * Move current pointer of stream as amount of size */ - virtual int skipBlock( int size ) SAL_OVERRIDE; + virtual int skipBlock( int size ) override; protected: /** * Initialize this object */ - virtual void init() SAL_OVERRIDE; + virtual void init() override; }; /* Memory, input and output devices */ @@ -147,24 +147,24 @@ class HMemIODev : public HIODev HMemIODev(char *s, int len); virtual ~HMemIODev(); - virtual bool open() SAL_OVERRIDE; - virtual void close() SAL_OVERRIDE; - virtual void flush() SAL_OVERRIDE; - virtual int state() const SAL_OVERRIDE; + virtual bool open() override; + virtual void close() override; + virtual void flush() override; + virtual int state() const override; /* gzip routine wrapper */ - virtual bool setCompressed( bool ) SAL_OVERRIDE; + virtual bool setCompressed( bool ) override; using HIODev::read1b; - virtual bool read1b(unsigned char &out) SAL_OVERRIDE; - virtual bool read1b(char &out) SAL_OVERRIDE; + virtual bool read1b(unsigned char &out) override; + virtual bool read1b(char &out) override; using HIODev::read2b; - virtual bool read2b(unsigned short &out) SAL_OVERRIDE; + virtual bool read2b(unsigned short &out) override; using HIODev::read4b; - virtual bool read4b(unsigned int &out) SAL_OVERRIDE; - virtual bool read4b(int &out) SAL_OVERRIDE; - virtual int readBlock( void *ptr, int size ) SAL_OVERRIDE; - virtual int skipBlock( int size ) SAL_OVERRIDE; + virtual bool read4b(unsigned int &out) override; + virtual bool read4b(int &out) override; + virtual int readBlock( void *ptr, int size ) override; + virtual int skipBlock( int size ) override; protected: - virtual void init() SAL_OVERRIDE; + virtual void init() override; }; #endif // INCLUDED_HWPFILTER_SOURCE_HIODEV_H diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index c94c078ef603..567d0f4d4d56 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -82,8 +82,8 @@ public: /** * parseStream does Parser-startup initializations */ - 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 sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) override {} void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > xHandler) { m_rxDocumentHandler = xHandler; @@ -162,20 +162,20 @@ public: public: // XFilter 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; + throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) override; // XImporter virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc) - throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; + throw( IllegalArgumentException, RuntimeException, std::exception ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames() 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; + OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: Reference< XFilter > rFilter; |