diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /filter | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphic/GraphicExportDialog.hxx | 12 | ||||
-rw-r--r-- | filter/source/graphic/GraphicExportFilter.hxx | 8 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 10 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.hxx | 22 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 6 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.hxx | 14 | ||||
-rw-r--r-- | filter/source/pdf/pdfinteract.hxx | 10 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.hxx | 28 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 59 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.hxx | 20 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 2 | ||||
-rw-r--r-- | filter/source/svg/test/odfserializer.cxx | 16 | ||||
-rw-r--r-- | filter/source/svg/test/svg2odf.cxx | 6 | ||||
-rw-r--r-- | filter/source/xsltdialog/typedetectionimport.hxx | 16 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 32 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 10 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 4 |
18 files changed, 146 insertions, 133 deletions
diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index 381f43921cf7..8c1028cd2e1e 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -57,21 +57,21 @@ public: virtual ~GraphicExportDialog(); // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ); + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyAccess - virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ); + virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues( const Sequence<PropertyValue>& aProps ) throw ( UnknownPropertyException, PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; // XExecuteDialog - virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ); - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ); + virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 39ea4b4b0d10..2dfd2f8d7b6e 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -61,14 +61,14 @@ public: virtual ~GraphicExportFilter(); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception); - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d9889867b0d2..c18781153b87 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -5057,11 +5057,11 @@ SvStream* EscherExGlobal::ImplQueryPictureStream() class SvNullStream : public SvStream { protected: - virtual sal_Size GetData( void* pData, sal_Size nSize ) { memset( pData, 0, nSize ); return nSize; } - virtual sal_Size PutData( const void*, sal_Size nSize ) { return nSize; } - virtual sal_Size SeekPos( sal_Size nPos ) { return nPos; } - virtual void SetSize( sal_Size ) {} - virtual void FlushData() {} + virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE { memset( pData, 0, nSize ); return nSize; } + virtual sal_Size PutData( const void*, sal_Size nSize ) SAL_OVERRIDE { return nSize; } + virtual sal_Size SeekPos( sal_Size nPos ) SAL_OVERRIDE { return nPos; } + virtual void SetSize( sal_Size ) SAL_OVERRIDE {} + virtual void FlushData() SAL_OVERRIDE {} public: SvNullStream() : SvStream() {} diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index be76a67c3756..5e44848d9111 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -179,8 +179,8 @@ public: protected: virtual void PageCreated( sal_uInt16 _nId, - SfxTabPage& _rPage ); - virtual short Ok(); + SfxTabPage& _rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; }; //class tab page general diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 420eca5eaa26..86ae9b19aa2e 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -48,23 +48,23 @@ private: protected: // OGenericUnoDialog - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception); - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception); - virtual Dialog* createDialog( Window* pParent ); - virtual void executedDialog( sal_Int16 nExecutionResult ); - virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; + virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XPropertyAccess using OPropertySetHelper::getPropertyValues; - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception); + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; using OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; public: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 1ebe0feac1bf..3c181e542242 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -270,7 +270,7 @@ class PDFExportStreamDoc : public vcl::PDFOutputStream {} virtual ~PDFExportStreamDoc(); - virtual void write( const Reference< XOutputStream >& xStream ); + virtual void write( const Reference< XOutputStream >& xStream ) SAL_OVERRIDE; }; PDFExportStreamDoc::~PDFExportStreamDoc() @@ -956,8 +956,8 @@ public: PDFErrorRequest( const task::PDFExportException& i_rExc ); // XInteractionRequest - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception); - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception); + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; }; PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) : diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index e9b26af66ef8..629d1ea48aeb 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -71,19 +71,19 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception); - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; public: diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index a5b34929841a..72217afe4b75 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -39,15 +39,15 @@ class PDFInteractionHandler : public cppu::WeakImplHelper2 < task::XInteractionH { protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XIniteractionHandler - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception); + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) SAL_OVERRIDE; // XIniteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) SAL_OVERRIDE; public: PDFInteractionHandler(); diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 254931d8b195..2903ba9e0fdf 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -47,28 +47,28 @@ private: protected: // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // OGenericUnoDialog - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual Dialog* createDialog( Window* pParent ); - virtual void executedDialog( sal_Int16 nExecutionResult ); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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 com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XPropertyAccess using cppu::OPropertySetHelper::getPropertyValues; - virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using cppu::OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 7cf948ad89d4..6b49d543ee39 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -98,21 +98,16 @@ static const char constSvgNamespace[] = "http://www.w3.org/2000/svg"; * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#define TEXT_FIELD_GET_CLASS_NAME_METHOD( class_name ) \ -virtual OUString getClassName() const \ -{ \ - static const char className[] = #class_name; \ - return OUString( className ); \ -} - - class TextField { protected: SVGFilter::ObjectSet mMasterPageSet; public: - TEXT_FIELD_GET_CLASS_NAME_METHOD( TextField ) + virtual OUString getClassName() const + { + return OUString( "TextField" ); + } virtual sal_Bool equalTo( const TextField & aTextField ) const = 0; virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const = 0; virtual void elementExport( SVGExport* pSVGExport ) const @@ -146,8 +141,11 @@ class FixedTextField : public TextField public: OUString text; - TEXT_FIELD_GET_CLASS_NAME_METHOD( FixedTextField ) - virtual sal_Bool equalTo( const TextField & aTextField ) const + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "FixedTextField" ); + } + virtual sal_Bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE { if( const FixedTextField* aFixedTextField = dynamic_cast< const FixedTextField* >( &aTextField ) ) { @@ -155,7 +153,7 @@ public: } return false; } - virtual void elementExport( SVGExport* pSVGExport ) const + virtual void elementExport( SVGExport* pSVGExport ) const SAL_OVERRIDE { TextField::elementExport( pSVGExport ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -168,8 +166,11 @@ class FixedDateTimeField : public FixedTextField { public: FixedDateTimeField() {} - TEXT_FIELD_GET_CLASS_NAME_METHOD( FixedDateTimeField ) - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "FixedDateTimeField" ); + } + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE { implGrowCharSet( aTextFieldCharSets, text, aOOOAttrDateTimeField ); } @@ -180,8 +181,11 @@ class FooterField : public FixedTextField { public: FooterField() {} - TEXT_FIELD_GET_CLASS_NAME_METHOD( FooterField ) - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "FooterField" ); + } + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE { static const OUString sFieldId = aOOOAttrFooterField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); @@ -193,8 +197,11 @@ class HeaderField : public FixedTextField { public: HeaderField() {} - TEXT_FIELD_GET_CLASS_NAME_METHOD( HeaderField ) - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "HeaderField" ); + } + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE { static const OUString sFieldId = aOOOAttrHeaderField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); @@ -205,7 +212,10 @@ public: class VariableTextField : public TextField { public: - TEXT_FIELD_GET_CLASS_NAME_METHOD( VariableTextField ) + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "VariableTextField" ); + } virtual ~VariableTextField() {} }; @@ -218,8 +228,11 @@ public: : format(0) { } - TEXT_FIELD_GET_CLASS_NAME_METHOD( VariableDateTimeField ) - virtual sal_Bool equalTo( const TextField & aTextField ) const + virtual OUString getClassName() const SAL_OVERRIDE + { + return OUString( "VariableDateTimeField" ); + } + virtual sal_Bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE { if( const VariableDateTimeField* aField = dynamic_cast< const VariableDateTimeField* >( &aTextField ) ) { @@ -227,7 +240,7 @@ public: } return false; } - virtual void elementExport( SVGExport* pSVGExport ) const + virtual void elementExport( SVGExport* pSVGExport ) const SAL_OVERRIDE { VariableTextField::elementExport( pSVGExport ); OUString sDateFormat, sTimeFormat; @@ -290,7 +303,7 @@ public: pSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeFormat, sDateTimeFormat ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); } - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE { // we use the unicode char set in an improper way: we put in the date/time fortat // in order to pass it to the CalcFieldValue method diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 536a956ee2e8..7fdf8f786495 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -129,11 +129,11 @@ public: protected: - virtual void _ExportStyles( bool /* bUsed */ ) {} - virtual void _ExportAutoStyles() {} - virtual void _ExportContent() {} - virtual void _ExportMasterStyles() {} - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) { return 0; } + virtual void _ExportStyles( bool /* bUsed */ ) SAL_OVERRIDE {} + virtual void _ExportAutoStyles() SAL_OVERRIDE {} + virtual void _ExportContent() SAL_OVERRIDE {} + virtual void _ExportMasterStyles() SAL_OVERRIDE {} + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) SAL_OVERRIDE { return 0; } private: @@ -315,17 +315,17 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception); - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XImporter - virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; // XExtendedFilterDetection - virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index f7b2efb7c6ac..64cd570d157c 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -415,7 +415,7 @@ public: // XSVGWriter virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler, - const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ); + const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index 6d16a35d7852..6ab67b8b1804 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -47,14 +47,14 @@ public: m_aLineFeed[0] = '\n'; } - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; private: uno::Reference<io::XOutputStream> m_xOutStream; diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 33b308c5aebf..d923dd42715a 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -46,18 +46,18 @@ namespace maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { maFile.close(); } diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index 85b753ef64e6..685a0a5d8d8d 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -67,21 +67,21 @@ public: static void doImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters ); virtual void SAL_CALL startDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + 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 ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endElement( const OUString& aName ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void fillFilterVector( XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 7a9fe4e66682..df9ab44262a4 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -74,35 +74,35 @@ public: protected: // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception); - virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XTypeProvider - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception); - virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); + 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(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; /** Called in dispose method after the listeners were notified. */ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxParent; /// parent window diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 2404c52fc916..20a8d8298d3e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -44,14 +44,14 @@ private: HeaderBar* m_pHeaderBar; XMLFilterListBox* m_pFocusCtrl; protected: - virtual void setAllocation(const Size &rAllocation); + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: SvxPathControl(Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } ~SvxPathControl(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -77,7 +77,7 @@ public: void changeEntry( const filter_info_impl* pInfo ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; @@ -92,7 +92,7 @@ public: DECL_LINK(SelectionChangedHdl_Impl, void * ); DECL_LINK(DoubleClickHdl_Impl, void * ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void onNew(); void onEdit(); @@ -104,7 +104,7 @@ public: void updateStates(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; bool isClosable(); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index d66f05ec8f6d..ab4b76572e5d 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -74,10 +74,10 @@ public: GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); // XEventListener - virtual void SAL_CALL notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const com::sun::star::document::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: XMLFilterTestDialog* mpDialog; }; |