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 /i18npool/source/localedata | |
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 'i18npool/source/localedata')
-rw-r--r-- | i18npool/source/localedata/LocaleNode.hxx | 24 | ||||
-rw-r--r-- | i18npool/source/localedata/localedata.cxx | 8 | ||||
-rw-r--r-- | i18npool/source/localedata/saxparser.cxx | 44 |
3 files changed, 38 insertions, 38 deletions
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index 59940db867ed..89e85bc39431 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -145,7 +145,7 @@ class LCInfoNode : public LocaleNode { public: inline LCInfoNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; @@ -154,7 +154,7 @@ public: inline LCCTYPENode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCFormatNode : public LocaleNode { @@ -164,7 +164,7 @@ public: inline LCFormatNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCCollationNode : public LocaleNode { @@ -172,7 +172,7 @@ public: inline LCCollationNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCIndexNode : public LocaleNode { @@ -180,7 +180,7 @@ public: inline LCIndexNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCSearchNode : public LocaleNode { @@ -188,7 +188,7 @@ public: inline LCSearchNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCCalendarNode : public LocaleNode { @@ -196,7 +196,7 @@ public: inline LCCalendarNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCCurrencyNode : public LocaleNode { @@ -204,7 +204,7 @@ public: inline LCCurrencyNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCTransliterationNode : public LocaleNode { @@ -212,7 +212,7 @@ public: inline LCTransliterationNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCMiscNode : public LocaleNode { @@ -220,7 +220,7 @@ public: inline LCMiscNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCNumberingLevelNode : public LocaleNode { @@ -228,7 +228,7 @@ public: inline LCNumberingLevelNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; class LCOutlineNumberingLevelNode : public LocaleNode { @@ -236,7 +236,7 @@ public: inline LCOutlineNumberingLevelNode (const OUString& name, const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; }; - virtual void generateCode (const OFileWriter &of) const; + virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE; }; #endif diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 7af865c94957..0df1835a844a 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1374,13 +1374,13 @@ public: ~OutlineNumbering(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception); + throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; //XElementAccess - virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception); + virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; }; Sequence< Reference<container::XIndexAccess> > SAL_CALL diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index 7c0bebccfa2a..5a68c5201499 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -70,7 +70,7 @@ public: public: virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE { nBytesToRead = (nBytesToRead > m_seq.getLength() - nPos ) ? m_seq.getLength() - nPos : @@ -82,22 +82,22 @@ public: virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE { return readBytes( aData, nMaxBytesToRead ); } virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE { // not implemented } virtual sal_Int32 SAL_CALL available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) + throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE { return m_seq.getLength() - nPos; } virtual void SAL_CALL closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) + throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE { // not needed } @@ -174,7 +174,7 @@ public: public: // Error handler - virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) + virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { ++nError; printf( "Error !\n" ); @@ -183,12 +183,12 @@ public: // Error handler Reference < XInterface >() , aSAXParseException ); } - virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) + virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { ++nError; printf( "Fatal Error !\n" ); } - virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) + virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { printf( "Warning !\n" ); } @@ -201,7 +201,7 @@ public: // ExtendedDocumentHandler stack<LocaleNode *> currentNode ; LocaleNode * rootNode; - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException, std::exception) + virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { printf( "parsing document %s started\n", theLocale); of.writeAsciiString("#include <sal/types.h>\n\n\n"); @@ -209,7 +209,7 @@ public: // ExtendedDocumentHandler of.writeAsciiString("extern \"C\" {\n\n"); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException, std::exception) + virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { if (rootNode) { @@ -234,7 +234,7 @@ public: // ExtendedDocumentHandler virtual void SAL_CALL startElement(const OUString& aName, const Reference< XAttributeList > & xAttribs) - throw (SAXException,RuntimeException, std::exception) + throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { LocaleNode * l = LocaleNode::createNode (aName, xAttribs); @@ -248,29 +248,29 @@ public: // ExtendedDocumentHandler } - virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { currentNode.pop(); } - virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { LocaleNode * l = currentNode.top(); l->setValue (aChars); } - virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { // ignored } virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/) - throw (SAXException,RuntimeException, std::exception) + throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { // ignored } @@ -278,7 +278,7 @@ public: // ExtendedDocumentHandler virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId) - throw (RuntimeException, std::exception) + throw (RuntimeException, std::exception) SAL_OVERRIDE { InputSource source; source.sSystemId = sSystemId; @@ -290,20 +290,20 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL endCDATA(void) throw (RuntimeException, std::exception) + virtual void SAL_CALL endCDATA(void) throw (RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) + virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException, std::exception ) + virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE { } |