summaryrefslogtreecommitdiff
path: root/i18npool/source/localedata
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /i18npool/source/localedata
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'i18npool/source/localedata')
-rw-r--r--i18npool/source/localedata/LocaleNode.hxx24
-rw-r--r--i18npool/source/localedata/localedata.cxx8
-rw-r--r--i18npool/source/localedata/saxparser.cxx44
3 files changed, 38 insertions, 38 deletions
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 2be8140344bf..142cb2416009 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -135,7 +135,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 SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
@@ -144,7 +144,7 @@ public:
inline LCCTYPENode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCFormatNode : public LocaleNode {
@@ -154,7 +154,7 @@ public:
inline LCFormatNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCCollationNode : public LocaleNode {
@@ -162,7 +162,7 @@ public:
inline LCCollationNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCIndexNode : public LocaleNode {
@@ -170,7 +170,7 @@ public:
inline LCIndexNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCSearchNode : public LocaleNode {
@@ -178,7 +178,7 @@ public:
inline LCSearchNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCCalendarNode : public LocaleNode {
@@ -186,7 +186,7 @@ public:
inline LCCalendarNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCCurrencyNode : public LocaleNode {
@@ -194,7 +194,7 @@ public:
inline LCCurrencyNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCTransliterationNode : public LocaleNode {
@@ -202,7 +202,7 @@ public:
inline LCTransliterationNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCMiscNode : public LocaleNode {
@@ -210,7 +210,7 @@ public:
inline LCMiscNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCNumberingLevelNode : public LocaleNode {
@@ -218,7 +218,7 @@ public:
inline LCNumberingLevelNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
class LCOutlineNumberingLevelNode : public LocaleNode {
@@ -226,7 +226,7 @@ public:
inline LCOutlineNumberingLevelNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
- virtual void generateCode (const OFileWriter &of) const SAL_OVERRIDE;
+ virtual void generateCode (const OFileWriter &of) const override;
};
#endif
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e087ab0f4055..344b3bfe23d7 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1360,13 +1360,13 @@ public:
virtual ~OutlineNumbering();
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override;
virtual Any SAL_CALL getByIndex( sal_Int32 Index )
- throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
//XElementAccess
- virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) override;
};
Sequence< Reference<container::XIndexAccess> > SAL_CALL
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index f3d4dcea88df..c8425862ecf1 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -68,7 +68,7 @@ public:
public:
virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
- throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE
+ throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
{
nBytesToRead = (nBytesToRead > m_seq.getLength() - nPos ) ?
m_seq.getLength() - nPos :
@@ -80,22 +80,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) SAL_OVERRIDE
+ throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
{
return readBytes( aData, nMaxBytesToRead );
}
virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ )
- throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE
+ throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
{
// not implemented
}
virtual sal_Int32 SAL_CALL available( )
- throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE
+ throw(NotConnectedException, IOException, RuntimeException, std::exception) override
{
return m_seq.getLength() - nPos;
}
virtual void SAL_CALL closeInput( )
- throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE
+ throw(NotConnectedException, IOException, RuntimeException, std::exception) override
{
// not needed
}
@@ -172,7 +172,7 @@ public:
public: // Error handler
- virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) override
{
++nError;
printf( "Error !\n" );
@@ -181,12 +181,12 @@ public: // Error handler
Reference < XInterface >() ,
aSAXParseException );
}
- virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override
{
++nError;
printf( "Fatal Error !\n" );
}
- virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override
{
printf( "Warning !\n" );
}
@@ -199,7 +199,7 @@ public: // ExtendedDocumentHandler
stack<LocaleNode *> currentNode ;
LocaleNode * rootNode;
- virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) override
{
printf( "parsing document %s started\n", theLocale);
of.writeAsciiString("#include <sal/types.h>\n\n\n");
@@ -207,7 +207,7 @@ public: // ExtendedDocumentHandler
of.writeAsciiString("extern \"C\" {\n\n");
}
- virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) override
{
if (rootNode)
{
@@ -232,7 +232,7 @@ public: // ExtendedDocumentHandler
virtual void SAL_CALL startElement(const OUString& aName,
const Reference< XAttributeList > & xAttribs)
- throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ throw (SAXException,RuntimeException, std::exception) override
{
LocaleNode * l = LocaleNode::createNode (aName, xAttribs);
@@ -246,29 +246,29 @@ public: // ExtendedDocumentHandler
}
- virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) override
{
currentNode.pop();
}
- virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) override
{
LocaleNode * l = currentNode.top();
l->setValue (aChars);
}
- virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) override
{
// ignored
}
virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/)
- throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ throw (SAXException,RuntimeException, std::exception) override
{
// ignored
}
@@ -276,7 +276,7 @@ public: // ExtendedDocumentHandler
virtual InputSource SAL_CALL resolveEntity(
const OUString& sPublicId,
const OUString& sSystemId)
- throw (RuntimeException, std::exception) SAL_OVERRIDE
+ throw (RuntimeException, std::exception) override
{
InputSource source;
source.sSystemId = sSystemId;
@@ -288,20 +288,20 @@ public: // ExtendedDocumentHandler
return source;
}
- virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE
+ virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) override
{
}