diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /i18npool | |
parent | 135907f2061550624ee1859745d94eee01849070 (diff) |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'i18npool')
20 files changed, 39 insertions, 39 deletions
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index c7c93dd2d6d7..59f84b769d11 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -72,11 +72,11 @@ public: throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 965296eb38f9..2ec0c0a2e049 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -78,11 +78,11 @@ public: throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index e6c6e547acea..466acb24240a 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -46,11 +46,11 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index a1d34a0ce6e6..d31fa9fbd90c 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -93,10 +93,10 @@ public: throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx index d10a17de87c8..eae7a0513ce4 100644 --- a/i18npool/inc/unoscripttypedetector.hxx +++ b/i18npool/inc/unoscripttypedetector.hxx @@ -44,11 +44,11 @@ public: //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 6df41fec581e..088e6b526d65 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -600,7 +600,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw ( } OUString SAL_CALL -BreakIteratorImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +BreakIteratorImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.BreakIterator"); } @@ -612,7 +612,7 @@ BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeE } Sequence< OUString > SAL_CALL -BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +BreakIteratorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.BreakIterator"; diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 933e775f12ff..126114c2c195 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -443,7 +443,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( } OUString SAL_CALL -BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString::createFromAscii(cBreakIterator); } @@ -455,7 +455,7 @@ BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno: } uno::Sequence< OUString > SAL_CALL -BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cBreakIterator); diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 68cf9c2116b3..67a82dbb7795 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -356,7 +356,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ } OUString SAL_CALL -CalendarImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +CalendarImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CalendarImpl"); } @@ -368,7 +368,7 @@ CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeExcept } Sequence< OUString > SAL_CALL -CalendarImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +CalendarImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.i18n.LocaleCalendar"; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index d2f513c2afff..eb6331d27082 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -1204,7 +1204,7 @@ Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 n } OUString SAL_CALL -Calendar_gregorian::getImplementationName(void) throw( RuntimeException, std::exception ) +Calendar_gregorian::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(cCalendar); } @@ -1216,7 +1216,7 @@ Calendar_gregorian::supportsService(const OUString& rServiceName) throw( Runtime } Sequence< OUString > SAL_CALL -Calendar_gregorian::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Calendar_gregorian::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cCalendar); diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 2cf2dd00d9d7..78648cd6ee98 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -192,7 +192,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca } OUString SAL_CALL -CharacterClassificationImpl::getImplementationName(void) +CharacterClassificationImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CharacterClassification"); @@ -206,7 +206,7 @@ CharacterClassificationImpl::supportsService(const OUString& rServiceName) } Sequence< OUString > SAL_CALL -CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +CharacterClassificationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.CharacterClassification"; diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 10b3f3277d3f..a38cb75c05c1 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1045,7 +1045,7 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT return OUString(); } -OUString DefaultNumberingProvider::getImplementationName(void) +OUString DefaultNumberingProvider::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.text.DefaultNumberingProvider"); @@ -1057,7 +1057,7 @@ sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) return cppu::supportsService(this, rServiceName); } -Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void) +Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 93da474aee14..e1cd90877f80 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -134,7 +134,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru } OUString SAL_CALL -InputSequenceCheckerImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(serviceName); } @@ -146,7 +146,7 @@ InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( R } Sequence< OUString > SAL_CALL -InputSequenceCheckerImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(serviceName); diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index b4b7127f584b..cbecd44b0204 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -61,7 +61,7 @@ public: void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; - void closeOutput(void) const; + void closeOutput() const; /// Return the locale string, something like en_US or de_DE const char * getLocale() const { return theLocale; } private: diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index 7264b12e9d80..02b0c327fbca 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -171,7 +171,7 @@ void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAscii fprintf(m_f, "0x0};\n"); } -void OFileWriter::closeOutput(void) const +void OFileWriter::closeOutput() const { if(m_f) { diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index a6a5e8023cbc..1674478a9c6a 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -200,7 +200,7 @@ public: // ExtendedDocumentHandler stack<LocaleNode *> currentNode ; LocaleNode * rootNode; - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { printf( "parsing document %s started\n", theLocale); of.writeAsciiString("#include <sal/types.h>\n\n\n"); @@ -208,7 +208,7 @@ public: // ExtendedDocumentHandler of.writeAsciiString("extern \"C\" {\n\n"); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { if (rootNode) { @@ -289,10 +289,10 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL endCDATA(void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) SAL_OVERRIDE { } virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE @@ -302,7 +302,7 @@ public: // ExtendedDocumentHandler { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE { } diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 3b39bfc8ccb9..42f9a08d46af 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -261,7 +261,7 @@ NumberFormatCodeMapper::createLocaleDataObject() { } OUString SAL_CALL -NumberFormatCodeMapper::getImplementationName(void) +NumberFormatCodeMapper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); @@ -274,7 +274,7 @@ sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServi } ::com::sun::star::uno::Sequence< OUString > SAL_CALL -NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +NumberFormatCodeMapper::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.NumberFormatMapper"; diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 9649de30880f..3f874c24de76 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -135,7 +135,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; -OUString SAL_CALL OrdinalSuffixService::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SAL_CALL OrdinalSuffixService::getImplementationName() throw( RuntimeException, std::exception ) { return OUString(cOrdinalSuffix); } @@ -145,7 +145,7 @@ sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServic return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = cOrdinalSuffix; diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 0ff2639f6267..9c2173581e45 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1089,7 +1089,7 @@ sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName) } Sequence< OUString > SAL_CALL -TextSearch::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = getServiceName_Static(); diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 760052a54e13..4b3a93d25791 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -135,11 +135,11 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index f780b6e65070..4ff2f3e6dc1e 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -657,7 +657,7 @@ TransliterationImpl::supportsService(const OUString& rServiceName) throw( Runtim } Sequence< OUString > SAL_CALL -TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +TransliterationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.Transliteration"; |