From 71b809959bb8f775d83dc52628448bb8b8322b28 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Apr 2015 12:44:47 +0200 Subject: 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 --- xmloff/source/chart/MultiPropertySetHandler.hxx | 8 ++++---- xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx | 10 +++++----- xmloff/source/core/attrlist.cxx | 2 +- xmloff/source/core/unoatrcn.cxx | 10 +++++----- xmloff/source/core/xmlimp.cxx | 6 +++--- xmloff/source/meta/xmlversion.cxx | 6 +++--- xmloff/source/transform/MutableAttrList.cxx | 2 +- xmloff/source/transform/MutableAttrList.hxx | 2 +- xmloff/source/transform/OOo2Oasis.cxx | 2 +- xmloff/source/transform/OOo2Oasis.hxx | 2 +- xmloff/source/transform/TransformerBase.cxx | 10 +++++----- xmloff/source/transform/TransformerBase.hxx | 10 +++++----- 12 files changed, 35 insertions(+), 35 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index 6a119f3c2c5e..0991e675c25f 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -123,7 +123,7 @@ public: */ MultiPropertySetHandler (::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xObject); - ~MultiPropertySetHandler (void); + ~MultiPropertySetHandler(); /** @descr Add a property to handle. The type given implicitly by the reference to a variable is used to create an instance of the PropertyWrapper template class. @@ -143,7 +143,7 @@ public: @return If none of the two interfaces is supported or using them both fails then sal_False is returned. Else True is returned. */ - inline bool GetProperties (void); + inline bool GetProperties(); private: /** @descr Try to use the XMultiPropertySet interface to get the property @@ -180,14 +180,14 @@ MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Referen { } -MultiPropertySetHandler::~MultiPropertySetHandler (void) +MultiPropertySetHandler::~MultiPropertySetHandler() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I) delete I->second; } -bool MultiPropertySetHandler::GetProperties (void) +bool MultiPropertySetHandler::GetProperties() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index eb9c4f3e68e1..63e00c332472 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -35,13 +35,13 @@ XMLEmbeddedObjectExportFilter::~XMLEmbeddedObjectExportFilter () throw() { } -void SAL_CALL XMLEmbeddedObjectExportFilter::startDocument( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::startDocument() throw( SAXException, RuntimeException, std::exception ) { // do nothing, filter this } -void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument() throw( SAXException, RuntimeException, std::exception) { // do nothing, filter this @@ -90,14 +90,14 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::setDocumentLocator( } // XExtendedDocumentHandler -void SAL_CALL XMLEmbeddedObjectExportFilter::startCDATA( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( xExtHandler.is() ) xExtHandler->startCDATA(); } -void SAL_CALL XMLEmbeddedObjectExportFilter::endCDATA( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::endCDATA() throw(RuntimeException, std::exception) { if( xExtHandler.is() ) @@ -111,7 +111,7 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::comment( const OUString& rComment ) xExtHandler->comment( rComment ); } -void SAL_CALL XMLEmbeddedObjectExportFilter::allowLineBreak( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::allowLineBreak() throw(SAXException, RuntimeException, std::exception) { if( xExtHandler.is() ) diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index a7513706e8fe..148b23e99cb4 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -70,7 +70,7 @@ struct SvXMLAttributeList_Impl -sal_Int16 SAL_CALL SvXMLAttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size()); } diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 1f4dfba3a76c..5c2bc39c8a53 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -50,13 +50,13 @@ SvUnoAttributeContainer::~SvUnoAttributeContainer() } // container::XElementAccess -uno::Type SAL_CALL SvUnoAttributeContainer::getElementType(void) +uno::Type SAL_CALL SvUnoAttributeContainer::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType::get(); } -sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements(void) +sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements() throw( uno::RuntimeException, std::exception ) { return mpContainer->GetAttrCount() != 0; @@ -131,7 +131,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName) return aAny; } -uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames() throw( uno::RuntimeException, std::exception ) { const sal_uInt16 nAttrCount = mpContainer->GetAttrCount(); @@ -248,12 +248,12 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name) } //XServiceInfo -OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvUnoAttributeContainer::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "SvUnoAttributeContainer" ); } -uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void) +uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { OUString aSN( "com.sun.star.xml.AttributeContainer" ); diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 922f49034e3e..9ac5a7a327e0 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -877,11 +877,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } // XExtendedDocumentHandler -void SAL_CALL SvXMLImport::startCDATA( void ) throw(xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL SvXMLImport::startCDATA() throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } -void SAL_CALL SvXMLImport::endCDATA( void ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvXMLImport::endCDATA() throw(uno::RuntimeException, std::exception) { } @@ -890,7 +890,7 @@ void SAL_CALL SvXMLImport::comment( const OUString& ) { } -void SAL_CALL SvXMLImport::allowLineBreak( void ) +void SAL_CALL SvXMLImport::allowLineBreak() throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 2e369b48da1f..068449ec8e39 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -109,7 +109,7 @@ XMLVersionListImport::XMLVersionListImport( xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK ); } -XMLVersionListImport::~XMLVersionListImport( void ) throw() +XMLVersionListImport::~XMLVersionListImport() throw() {} SvXMLImportContext *XMLVersionListImport::CreateContext( @@ -141,7 +141,7 @@ XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport, { } -XMLVersionListContext::~XMLVersionListContext( void ) +XMLVersionListContext::~XMLVersionListContext() {} SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefix, @@ -216,7 +216,7 @@ XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport, aList[nLength] = aInfo; } -XMLVersionContext::~XMLVersionContext( void ) +XMLVersionContext::~XMLVersionContext() {} bool XMLVersionContext::ParseISODateTimeString( diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index dedb6edea8cf..7839fead2c70 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -88,7 +88,7 @@ sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething( return 0; } -sal_Int16 SAL_CALL XMLMutableAttributeList::getLength(void) +sal_Int16 SAL_CALL XMLMutableAttributeList::getLength() throw( RuntimeException, std::exception ) { return m_xAttrList->getLength(); diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 5383f22dd342..eb287c52f71b 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -53,7 +53,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 6ec9363980de..79fb4fe909d3 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1935,7 +1935,7 @@ void SAL_CALL OOo2OasisTransformer::initialize( Initialize( rArguments ); } -void SAL_CALL OOo2OasisTransformer::startDocument( void ) +void SAL_CALL OOo2OasisTransformer::startDocument() throw( SAXException, RuntimeException, std::exception ) { if( !GetDocHandler().is() ) diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index f2e9bc6c3628..085b9f991184 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -94,7 +94,7 @@ public: void SAL_CALL Initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString GetEventName( const OUString& rName, diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 4a6ba52dd58c..8d8e12ed37ce 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -209,13 +209,13 @@ XMLTransformerBase::~XMLTransformerBase() throw () delete m_pTokenMap; } -void SAL_CALL XMLTransformerBase::startDocument( void ) +void SAL_CALL XMLTransformerBase::startDocument() throw( SAXException, RuntimeException, std::exception ) { m_xHandler->startDocument(); } -void SAL_CALL XMLTransformerBase::endDocument( void ) +void SAL_CALL XMLTransformerBase::endDocument() throw( SAXException, RuntimeException, std::exception) { m_xHandler->endDocument(); @@ -382,13 +382,13 @@ void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator } // XExtendedDocumentHandler -void SAL_CALL XMLTransformerBase::startCDATA( void ) throw(SAXException, RuntimeException, std::exception) +void SAL_CALL XMLTransformerBase::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( m_xExtHandler.is() ) m_xExtHandler->startCDATA(); } -void SAL_CALL XMLTransformerBase::endCDATA( void ) throw(RuntimeException, std::exception) +void SAL_CALL XMLTransformerBase::endCDATA() throw(RuntimeException, std::exception) { if( m_xExtHandler.is() ) m_xExtHandler->endCDATA(); @@ -401,7 +401,7 @@ void SAL_CALL XMLTransformerBase::comment( const OUString& rComment ) m_xExtHandler->comment( rComment ); } -void SAL_CALL XMLTransformerBase::allowLineBreak( void ) +void SAL_CALL XMLTransformerBase::allowLineBreak() throw(SAXException, RuntimeException, std::exception) { if( m_xExtHandler.is() ) diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index 893a3c064084..ec95efcda74a 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -87,9 +87,9 @@ public: virtual ~XMLTransformerBase() throw(); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) @@ -107,11 +107,11 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -- cgit