From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: 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 --- sdext/source/minimizer/informationdialog.hxx | 4 +- sdext/source/minimizer/optimizerdialog.hxx | 30 ++--- sdext/source/minimizer/pppoptimizer.hxx | 10 +- sdext/source/minimizer/pppoptimizerdialog.hxx | 18 +-- sdext/source/pdfimport/filterdet.cxx | 8 +- sdext/source/pdfimport/filterdet.hxx | 2 +- sdext/source/pdfimport/inc/pdfparse.hxx | 56 +++++----- sdext/source/pdfimport/misc/pwdinteract.cxx | 14 +-- sdext/source/pdfimport/odf/odfemitter.cxx | 6 +- sdext/source/pdfimport/pdfiadaptor.hxx | 10 +- sdext/source/pdfimport/pdfparse/pdfparse.cxx | 8 +- sdext/source/pdfimport/sax/emitcontext.hxx | 6 +- sdext/source/pdfimport/sax/saxattrlist.hxx | 14 +-- sdext/source/pdfimport/test/outputwrap.hxx | 6 +- sdext/source/pdfimport/test/pdfunzip.cxx | 8 +- sdext/source/pdfimport/test/tests.cxx | 60 +++++----- sdext/source/pdfimport/tree/drawtreevisiting.hxx | 48 ++++---- sdext/source/pdfimport/tree/genericelements.hxx | 18 +-- sdext/source/pdfimport/tree/pdfiprocessor.hxx | 60 +++++----- sdext/source/pdfimport/tree/treevisitorfactory.cxx | 18 +-- sdext/source/pdfimport/tree/writertreevisiting.hxx | 48 ++++---- sdext/source/presenter/PresenterAccessibility.cxx | 124 ++++++++++----------- sdext/source/presenter/PresenterAccessibility.hxx | 12 +- sdext/source/presenter/PresenterButton.hxx | 26 ++--- sdext/source/presenter/PresenterController.hxx | 28 ++--- .../presenter/PresenterCurrentSlideObserver.hxx | 24 ++-- .../presenter/PresenterFrameworkObserver.hxx | 6 +- sdext/source/presenter/PresenterHelpView.hxx | 18 +-- sdext/source/presenter/PresenterNotesView.hxx | 26 ++--- sdext/source/presenter/PresenterPane.hxx | 16 +-- sdext/source/presenter/PresenterPaneBase.hxx | 18 +-- .../presenter/PresenterPaneBorderPainter.hxx | 10 +- sdext/source/presenter/PresenterPaneContainer.hxx | 4 +- sdext/source/presenter/PresenterPaneFactory.hxx | 6 +- .../source/presenter/PresenterProtocolHandler.cxx | 40 +++---- .../source/presenter/PresenterProtocolHandler.hxx | 8 +- sdext/source/presenter/PresenterScreen.cxx | 6 +- sdext/source/presenter/PresenterScreen.hxx | 8 +- sdext/source/presenter/PresenterScrollBar.hxx | 42 +++---- sdext/source/presenter/PresenterSlidePreview.hxx | 22 ++-- sdext/source/presenter/PresenterSlideShowView.hxx | 68 +++++------ sdext/source/presenter/PresenterSlideSorter.hxx | 38 +++---- sdext/source/presenter/PresenterSpritePane.hxx | 18 +-- sdext/source/presenter/PresenterTimer.cxx | 4 +- sdext/source/presenter/PresenterTimer.hxx | 2 +- sdext/source/presenter/PresenterToolBar.cxx | 46 ++++---- sdext/source/presenter/PresenterToolBar.hxx | 44 ++++---- sdext/source/presenter/PresenterViewFactory.cxx | 2 +- sdext/source/presenter/PresenterViewFactory.hxx | 6 +- sdext/source/presenter/PresenterWindowManager.hxx | 26 ++--- 50 files changed, 575 insertions(+), 575 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 42427105f6e5..75bba9d6fe75 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -79,8 +79,8 @@ class OKActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XA public: OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: InformationDialog& mrInformationDialog; diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index e69d4ec5ac50..6c7241568d48 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -133,8 +133,8 @@ class ItemListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XItemL public: ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; @@ -147,8 +147,8 @@ class ActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XAct public: ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; @@ -161,8 +161,8 @@ class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper1< com::sun::star public: ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; @@ -175,8 +175,8 @@ class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun: public: TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; @@ -189,8 +189,8 @@ class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper1< com::sun::star: public: TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; @@ -203,11 +203,11 @@ class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun: public: SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OptimizerDialog& mrOptimizerDialog; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index 5c6dd9dadf43..c9121eb70909 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -48,22 +48,22 @@ public: // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( - const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ); + const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatch virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static sal_Int64 GetFileSize( const OUString& rURL ); }; diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index c8a563686cce..c6b1f4534f77 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -58,37 +58,37 @@ public: // XInitialization 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, std::exception ); + throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + 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 ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( - const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ); + const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatch virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; OUString PPPOptimizerDialog_getImplementationName(); diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index b412294ba51e..0195c32b7357 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -57,10 +57,10 @@ public: const pdfparse::PDFContainer* pTop ); virtual ~FileEmitContext(); - virtual bool write( const void* pBuf, unsigned int nLen ); - virtual unsigned int getCurPos(); - virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ); - virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ); + virtual bool write( const void* pBuf, unsigned int nLen ) SAL_OVERRIDE; + virtual unsigned int getCurPos() SAL_OVERRIDE; + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) SAL_OVERRIDE; + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) SAL_OVERRIDE; const uno::Reference< io::XStream >& getContextStream() const { return m_xContextStream; } }; diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index f883afa5883b..75b580868548 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -50,7 +50,7 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index fc96504fe8d8..f747e8c41177 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -73,8 +73,8 @@ struct PDFComment : public PDFEntry PDFComment( const OString& rComment ) : PDFEntry(), m_aComment( rComment ) {} virtual ~PDFComment(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFValue : public PDFEntry @@ -91,8 +91,8 @@ struct PDFName : public PDFValue PDFName( const OString& rName ) : PDFValue(), m_aName( rName ) {} virtual ~PDFName(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; OUString getFilteredName() const; }; @@ -104,8 +104,8 @@ struct PDFString : public PDFValue PDFString( const OString& rString ) : PDFValue(), m_aString( rString ) {} virtual ~PDFString(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; OString getFilteredString() const; }; @@ -117,8 +117,8 @@ struct PDFNumber : public PDFValue PDFNumber( double fVal ) : PDFValue(), m_fValue( fVal ) {} virtual ~PDFNumber(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFBool : public PDFValue @@ -128,8 +128,8 @@ struct PDFBool : public PDFValue PDFBool( bool bVal ) : PDFValue(), m_bValue( bVal ) {} virtual ~PDFBool(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFObjectRef : public PDFValue @@ -140,16 +140,16 @@ struct PDFObjectRef : public PDFValue PDFObjectRef( unsigned int nNr, unsigned int nGen ) : PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {} virtual ~PDFObjectRef(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFNull : public PDFValue { PDFNull() {} virtual ~PDFNull(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFObject; @@ -174,8 +174,8 @@ struct PDFArray : public PDFContainer { PDFArray() {} virtual ~PDFArray(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFDict : public PDFContainer @@ -185,8 +185,8 @@ struct PDFDict : public PDFContainer PDFDict() {} virtual ~PDFDict(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; // inserting a value of NULL will remove rName and the previous value // from the dictionary @@ -207,8 +207,8 @@ struct PDFStream : public PDFEntry PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict ) : PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {} virtual ~PDFStream(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; unsigned int getDictLength( const PDFContainer* pObjectContainer = NULL ) const; // get contents of the "Length" entry of the dict }; @@ -219,8 +219,8 @@ struct PDFTrailer : public PDFContainer PDFTrailer() : PDFContainer(), m_pDict( NULL ) {} virtual ~PDFTrailer(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; struct PDFFileImplData; @@ -240,8 +240,8 @@ struct PDFFile : public PDFContainer {} virtual ~PDFFile(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; bool isEncrypted() const; @@ -269,8 +269,8 @@ struct PDFObject : public PDFContainer PDFObject( unsigned int nNr, unsigned int nGen ) : m_pObject( NULL ), m_pStream( NULL ), m_nNumber( nNr ), m_nGeneration( nGen ) {} virtual ~PDFObject(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; // writes only the contained stream, deflated if necessary bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const; @@ -287,8 +287,8 @@ struct PDFPart : public PDFContainer { PDFPart() : PDFContainer() {} virtual ~PDFPart(); - virtual bool emit( EmitContext& rWriteContext ) const; - virtual PDFEntry* clone() const; + virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; + virtual PDFEntry* clone() const SAL_OVERRIDE; }; class PDFReader diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 0e0d58622da4..e0c27aa37cad 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -57,15 +57,15 @@ public: explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName); // 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; // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInteractionContinuation - virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } @@ -129,7 +129,7 @@ public: private: virtual ~UnsupportedEncryptionFormatRequest() {} - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) { + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::makeAny( task::ErrorCodeRequest( OUString(), uno::Reference< uno::XInterface >(), @@ -139,7 +139,7 @@ private: } virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > - SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) { + SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); } diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 540d6476931e..80a31fa7c0de 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -41,9 +41,9 @@ private: public: explicit OdfEmitter( const uno::Reference& xOutput ); - virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const OUString& rString ); - virtual void endTag( const char* pTag ); + virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE; + virtual void write( const OUString& rString ) SAL_OVERRIDE; + virtual void endTag( const char* pTag ) SAL_OVERRIDE; }; OdfEmitter::OdfEmitter( const uno::Reference& xOutput ) : diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index 7b99f179e756..7276d08e705e 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -57,12 +57,12 @@ namespace pdfi ::com::sun::star::uno::XComponentContext >& xContext ); // XFilter - virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw(std::exception); + virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException, std::exception ); + throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; }; @@ -119,11 +119,11 @@ namespace pdfi // XImportFilter virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl, - const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ); + const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException, std::exception ); + throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index ec8b6439dd10..21c191c3c97b 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -50,16 +50,16 @@ class StringEmitContext : public EmitContext public: StringEmitContext() : EmitContext(), m_aBuf(256) {} virtual ~StringEmitContext() {} - virtual bool write( const void* pBuf, unsigned int nLen ) throw() + virtual bool write( const void* pBuf, unsigned int nLen ) throw() SAL_OVERRIDE { m_aBuf.append( (const sal_Char*)pBuf, nLen ); return true; } - virtual unsigned int getCurPos() throw() { return m_aBuf.getLength(); } - virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() + virtual unsigned int getCurPos() throw() SAL_OVERRIDE { return m_aBuf.getLength(); } + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() SAL_OVERRIDE { return (nOrigOffset+nLen < static_cast(m_aBuf.getLength()) ) ? write( m_aBuf.getStr() + nOrigOffset, nLen ) : false; } - virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() SAL_OVERRIDE { if( nOrigOffset+nLen < static_cast(m_aBuf.getLength()) ) { diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index d721b5104089..a54fa7a7da95 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -40,9 +40,9 @@ namespace pdfi com::sun::star::xml::sax::XDocumentHandler >& xDocHdl ); ~SaxEmitter(); - virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const OUString& rString ); - virtual void endTag( const char* pTag ); + virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE; + virtual void write( const OUString& rString ) SAL_OVERRIDE; + virtual void endTag( const char* pTag ) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 92eff9ed3435..8b8494463fa7 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -53,15 +53,15 @@ namespace pdfi virtual ~SaxAttrList(); // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw(std::exception); - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception); - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception); - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception); - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception); - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception); + virtual sal_Int16 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index 40b2e2b825b2..1857c20e3e0b 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper1< 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/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 5558e0cb7e38..7ea3aaadce81 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -64,10 +64,10 @@ class FileEmitContext : public EmitContext FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop ); virtual ~FileEmitContext(); - virtual bool write( const void* pBuf, unsigned int nLen ) throw(); - virtual unsigned int getCurPos() throw(); - virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw(); - virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw(); + virtual bool write( const void* pBuf, unsigned int nLen ) throw() SAL_OVERRIDE; + virtual unsigned int getCurPos() throw() SAL_OVERRIDE; + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() SAL_OVERRIDE; + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() SAL_OVERRIDE; }; FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop ) diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 93c3a53c8b71..5fe48aca521b 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -115,40 +115,40 @@ namespace GraphicsContext& getCurrentContext() { return m_aGCStack.back(); } // ContentSink interface implementation - virtual void setPageNum( sal_Int32 nNumPages ) + virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE { m_nNumPages = nNumPages; } - virtual void startPage( const geometry::RealSize2D& rSize ) + virtual void startPage( const geometry::RealSize2D& rSize ) SAL_OVERRIDE { m_aPageSize = rSize; } - virtual void endPage() + virtual void endPage() SAL_OVERRIDE { m_bPageEnded = true; } virtual void hyperLink( const geometry::RealRectangle2D& rBounds, - const OUString& rURI ) + const OUString& rURI ) SAL_OVERRIDE { m_aHyperlinkBounds = rBounds; m_aURI = rURI; } - virtual void pushState() + virtual void pushState() SAL_OVERRIDE { GraphicsContextStack::value_type const a(m_aGCStack.back()); m_aGCStack.push_back(a); } - virtual void popState() + virtual void popState() SAL_OVERRIDE { m_aGCStack.pop_back(); } - virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) + virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE { basegfx::unotools::homMatrixFromAffineMatrix( getCurrentContext().Transformation, @@ -156,7 +156,7 @@ namespace } virtual void setLineDash( const uno::Sequence& dashes, - double start ) + double start ) SAL_OVERRIDE { GraphicsContext& rContext( getCurrentContext() ); if( dashes.getLength() ) @@ -164,47 +164,47 @@ namespace CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "line dashing start offset", start, 0.0, 0.000000001 ); } - virtual void setFlatness( double nFlatness ) + virtual void setFlatness( double nFlatness ) SAL_OVERRIDE { getCurrentContext().Flatness = nFlatness; } - virtual void setLineJoin(sal_Int8 nJoin) + virtual void setLineJoin(sal_Int8 nJoin) SAL_OVERRIDE { getCurrentContext().LineJoin = nJoin; } - virtual void setLineCap(sal_Int8 nCap) + virtual void setLineCap(sal_Int8 nCap) SAL_OVERRIDE { getCurrentContext().LineCap = nCap; } - virtual void setMiterLimit(double nVal) + virtual void setMiterLimit(double nVal) SAL_OVERRIDE { getCurrentContext().MiterLimit = nVal; } - virtual void setLineWidth(double nVal) + virtual void setLineWidth(double nVal) SAL_OVERRIDE { getCurrentContext().LineWidth = nVal; } - virtual void setFillColor( const rendering::ARGBColor& rColor ) + virtual void setFillColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE { getCurrentContext().FillColor = rColor; } - virtual void setStrokeColor( const rendering::ARGBColor& rColor ) + virtual void setStrokeColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE { getCurrentContext().LineColor = rColor; } - virtual void setBlendMode(sal_Int8 nMode) + virtual void setBlendMode(sal_Int8 nMode) SAL_OVERRIDE { getCurrentContext().BlendMode = nMode; } - virtual void setFont( const FontAttributes& rFont ) + virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE { FontToIdMap::const_iterator it = m_aFontToId.find( rFont ); if( it != m_aFontToId.end() ) @@ -218,7 +218,7 @@ namespace } } - virtual void strokePath( const uno::Reference& rPath ) + virtual void strokePath( const uno::Reference& rPath ) SAL_OVERRIDE { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -277,7 +277,7 @@ namespace rContext.FontId, (sal_Int32) 0 ); } - virtual void fillPath( const uno::Reference& rPath ) + virtual void fillPath( const uno::Reference& rPath ) SAL_OVERRIDE { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -296,7 +296,7 @@ namespace rContext.FontId, (sal_Int32) 0 ); } - virtual void eoFillPath( const uno::Reference& rPath ) + virtual void eoFillPath( const uno::Reference& rPath ) SAL_OVERRIDE { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -322,7 +322,7 @@ namespace m_bRedCircleSeen = true; } - virtual void intersectClip(const uno::Reference& rPath) + virtual void intersectClip(const uno::Reference& rPath) SAL_OVERRIDE { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; @@ -333,7 +333,7 @@ namespace getCurrentContext().Clip = aNewClip; } - virtual void intersectEoClip(const uno::Reference& rPath) + virtual void intersectEoClip(const uno::Reference& rPath) SAL_OVERRIDE { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; @@ -346,18 +346,18 @@ namespace virtual void drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& /*rRect*/, - const geometry::Matrix2D& /*rFontMatrix*/ ) + const geometry::Matrix2D& /*rFontMatrix*/ ) SAL_OVERRIDE { m_aTextOut.append(rGlyphs); } - virtual void endText() + virtual void endText() SAL_OVERRIDE { m_aTextOut.append( "\n" ); } virtual void drawMask(const uno::Sequence& xBitmap, - bool /*bInvert*/ ) + bool /*bInvert*/ ) SAL_OVERRIDE { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties", xBitmap.getLength(), (sal_Int32) 3 ); @@ -367,7 +367,7 @@ namespace xBitmap[1].Name.equalsAscii( "InputStream" ) ); } - virtual void drawImage(const uno::Sequence& xBitmap ) + virtual void drawImage(const uno::Sequence& xBitmap ) SAL_OVERRIDE { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage received two properties", xBitmap.getLength(), (sal_Int32) 3 ); @@ -379,7 +379,7 @@ namespace } virtual void drawColorMaskedImage(const uno::Sequence& xBitmap, - const uno::Sequence& /*xMaskColors*/ ) + const uno::Sequence& /*xMaskColors*/ ) SAL_OVERRIDE { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage received two properties", xBitmap.getLength(), (sal_Int32) 3 ); @@ -391,7 +391,7 @@ namespace virtual void drawMaskedImage(const uno::Sequence& xBitmap, const uno::Sequence& xMask, - bool /*bInvertMask*/) + bool /*bInvertMask*/) SAL_OVERRIDE { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two properties #1", xBitmap.getLength(), (sal_Int32) 3 ); @@ -409,7 +409,7 @@ namespace } virtual void drawAlphaMaskedImage(const uno::Sequence& xBitmap, - const uno::Sequence& xMask) + const uno::Sequence& xMask) SAL_OVERRIDE { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage received two properties #1", xBitmap.getLength(), (sal_Int32) 3 ); @@ -426,7 +426,7 @@ namespace xMask[1].Name.equalsAscii( "InputStream" ) ); } - virtual void setTextRenderMode( sal_Int32 ) + virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE { } diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index 9b4688efd285..2bd8a5aaeafc 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx @@ -44,14 +44,14 @@ namespace pdfi m_rProcessor(rProcessor) {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; class DrawXmlFinalizer : public ElementTreeVisitor @@ -67,14 +67,14 @@ namespace pdfi m_rProcessor(rProcessor) {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; class DrawXmlEmitter : public ElementTreeVisitor @@ -106,14 +106,14 @@ namespace pdfi m_bWriteDrawDocument(eDocType==DRAW_DOC) {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index a616d377ca55..5593ecb776f6 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -107,7 +107,7 @@ namespace pdfi { ListElement() : Element( NULL ) {} // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; struct HyperlinkElement : public Element @@ -118,7 +118,7 @@ namespace pdfi : Element( pParent ), URI( rURI ) {} public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; OUString URI; }; @@ -154,7 +154,7 @@ namespace pdfi public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; struct TextElement : public GraphicalElement @@ -166,7 +166,7 @@ namespace pdfi public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; OUStringBuffer Text; sal_Int32 FontId; @@ -180,7 +180,7 @@ namespace pdfi public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; // returns true only if only a single line is contained bool isSingleLined( PDFIProcessor& rProc ) const; @@ -204,7 +204,7 @@ namespace pdfi sal_Int8 nAction ); public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; void updateGeometry(); @@ -225,7 +225,7 @@ namespace pdfi public: // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; ImageId Image; }; @@ -246,7 +246,7 @@ namespace pdfi virtual ~PageElement(); // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; void emitPageAnchoredElements( EmitContext& rEmitContext ); static void updateParagraphGeometry( Element* pEle ); @@ -273,7 +273,7 @@ namespace pdfi virtual ~DocumentElement(); // ElementTreeVisitable - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 98236d4ea9dc..979e17015c2b 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -119,51 +119,51 @@ namespace pdfi // ContentSink interface implementation - virtual void setPageNum( sal_Int32 nNumPages ); - virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ); - virtual void endPage(); + virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE; + virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) SAL_OVERRIDE; + virtual void endPage() SAL_OVERRIDE; virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const OUString& rURI ); - virtual void pushState(); - virtual void popState(); - virtual void setFlatness( double ); - virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ); + const OUString& rURI ) SAL_OVERRIDE; + virtual void pushState() SAL_OVERRIDE; + virtual void popState() SAL_OVERRIDE; + virtual void setFlatness( double ) SAL_OVERRIDE; + virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE; virtual void setLineDash( const ::com::sun::star::uno::Sequence& dashes, - double start ); - virtual void setLineJoin(sal_Int8); - virtual void setLineCap(sal_Int8); - virtual void setMiterLimit(double); - virtual void setLineWidth(double); - virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ); - virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ); - virtual void setBlendMode(sal_Int8); - virtual void setFont( const FontAttributes& rFont ); - virtual void setTextRenderMode( sal_Int32 ); + double start ) SAL_OVERRIDE; + virtual void setLineJoin(sal_Int8) SAL_OVERRIDE; + virtual void setLineCap(sal_Int8) SAL_OVERRIDE; + virtual void setMiterLimit(double) SAL_OVERRIDE; + virtual void setLineWidth(double) SAL_OVERRIDE; + virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE; + virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE; + virtual void setBlendMode(sal_Int8) SAL_OVERRIDE; + virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE; + virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE; virtual void strokePath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ); + ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; virtual void fillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ); + ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; virtual void eoFillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ); + ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; virtual void intersectClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath); + ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; virtual void intersectEoClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath); + ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, - const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); - virtual void endText(); + const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE; + virtual void endText() SAL_OVERRIDE; virtual void drawMask(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& xBitmap, - bool bInvert ); + bool bInvert ) SAL_OVERRIDE; /// Given image must already be color-mapped and normalized to sRGB. virtual void drawImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap ); + ::com::sun::star::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE; /** Given image must already be color-mapped and normalized to sRGB. maskColors must contain two sequences of color components @@ -171,16 +171,16 @@ namespace pdfi virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& xBitmap, const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any>& xMaskColors ); + ::com::sun::star::uno::Any>& xMaskColors ) SAL_OVERRIDE; virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& xBitmap, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& xMask, - bool bInvertMask); + bool bInvertMask) SAL_OVERRIDE; virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& xImage, const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xMask); + ::com::sun::star::beans::PropertyValue>& xMask) SAL_OVERRIDE; /// nElements == -1 means fill in number of pages void startIndicator( const OUString& rText, sal_Int32 nElements = -1 ); diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx index badada10541a..9a2352917e88 100644 --- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx +++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx @@ -28,19 +28,19 @@ namespace pdfi { WriterTreeVisitorFactory() {} - virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const + virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE { return boost::shared_ptr(new WriterXmlOptimizer(rProc)); } virtual boost::shared_ptr createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const + PDFIProcessor& rProc ) const SAL_OVERRIDE { return boost::shared_ptr(new WriterXmlFinalizer(rStyles,rProc)); } - virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor&) const + virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor&) const SAL_OVERRIDE { return boost::shared_ptr(new WriterXmlEmitter(rEmitContext)); } @@ -50,19 +50,19 @@ namespace pdfi { ImpressTreeVisitorFactory() {} - virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const + virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlOptimizer(rProc)); } virtual boost::shared_ptr createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const + PDFIProcessor& rProc ) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlFinalizer(rStyles,rProc)); } - virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const + virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlEmitter(rEmitContext, DrawXmlEmitter::IMPRESS_DOC, @@ -75,19 +75,19 @@ namespace pdfi { DrawTreeVisitorFactory() {} - virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const + virtual boost::shared_ptr createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlOptimizer(rProc)); } virtual boost::shared_ptr createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const + PDFIProcessor& rProc ) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlFinalizer(rStyles,rProc)); } - virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const + virtual boost::shared_ptr createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE { return boost::shared_ptr(new DrawXmlEmitter(rEmitContext, DrawXmlEmitter::DRAW_DOC, diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index b0e8ef04af9a..d2cef9df9ddf 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.hxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx @@ -40,14 +40,14 @@ namespace pdfi virtual ~WriterXmlOptimizer() {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; class WriterXmlFinalizer : public ElementTreeVisitor @@ -69,14 +69,14 @@ namespace pdfi virtual ~WriterXmlFinalizer() {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; class WriterXmlEmitter : public ElementTreeVisitor @@ -94,14 +94,14 @@ namespace pdfi virtual ~WriterXmlEmitter() {} - virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ); - virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ); + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; }; } diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 01e997a2b76f..fc10b5daf695 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -79,7 +79,7 @@ public: const cssu::Reference& rxBorderWindow); void SetAccessibleParent (const cssu::Reference& rxAccessibleParent); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void NotifyCurrentSlideChange (const sal_Int32 nCurrentSlideIndex); @@ -98,115 +98,115 @@ public: //----- XComponent --------------------------------------------------- - virtual void SAL_CALL dispose()throw (cssu::RuntimeException, std::exception) + virtual void SAL_CALL dispose()throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //----- XAccessible ------------------------------------------------------- virtual cssu::Reference SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleContext ---------------------------------------------- virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleParent (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getAccessibleStateSet (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::lang::Locale SAL_CALL getLocale (void) throw (cssu::RuntimeException, - cssa::IllegalAccessibleComponentStateException, std::exception); + cssa::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getAccessibleAtPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getBounds (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Point SAL_CALL getLocation (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Point SAL_CALL getLocationOnScreen (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getSize (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addAccessibleEventListener ( const cssu::Reference& rxListener) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const cssu::Reference& rxListener) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XWindowListener --------------------------------------------------- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; protected: OUString msName; @@ -258,16 +258,16 @@ public: //----- XAccessibleStateSet ----------------------------------------------- virtual sal_Bool SAL_CALL isEmpty (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL contains (sal_Int16 nState) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL containsAll (const cssu::Sequence& rStateSet) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Sequence SAL_CALL getStates (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; private: const sal_Int32 mnStateSet; @@ -296,16 +296,16 @@ public: //----- XAccessibleRelationSet -------------------------------------------- virtual sal_Int32 SAL_CALL getRelationCount (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) - throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception); + throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; private: ::std::vector maRelations; @@ -337,83 +337,83 @@ public: virtual cssu::Reference SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleText --------------------------------------------------- virtual sal_Int32 SAL_CALL getCaretPosition (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Sequence SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, const cssu::Sequence& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getCharacterCount (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSelectedText (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionStart (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionEnd (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getText (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssa::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssa::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssa::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual awt::Point GetRelativeLocation (void); - virtual awt::Size GetSize (void); - virtual awt::Point GetAbsoluteParentLocation (void); - virtual bool GetWindowState (const sal_Int16 nType) const; + virtual awt::Point GetRelativeLocation (void) SAL_OVERRIDE; + virtual awt::Size GetSize (void) SAL_OVERRIDE; + virtual awt::Point GetAbsoluteParentLocation (void) SAL_OVERRIDE; + virtual bool GetWindowState (const sal_Int16 nType) const SAL_OVERRIDE; private: SharedPresenterTextParagraph mpParagraph; @@ -502,7 +502,7 @@ public: virtual void SetWindow ( const cssu::Reference& rxContentWindow, - const cssu::Reference& rxBorderWindow); + const cssu::Reference& rxBorderWindow) SAL_OVERRIDE; private: ::boost::shared_ptr mpTextView; diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 666db78b0244..00e94887cdad 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -74,31 +74,31 @@ public: const sal_Int32 nCurrentSlideIndex, const sal_Int32 nSlideCount); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; //----- XAccessible ------------------------------------------------------- virtual cssu::Reference SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XFocusListener ---------------------------------------------------- virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XInitialization --------------------------------------------------- virtual void SAL_CALL initialize (const cssu::Sequence& rArguments) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 24ca2a08389a..a1abb4b3794c 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -66,7 +66,7 @@ public: const OUString& rsConfigurationName); ~PresenterButton (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void SetCenter (const css::geometry::RealPoint2D& rLocation); void SetCanvas ( @@ -77,47 +77,47 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::rtl::Reference mpPresenterController; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 081d5b3074be..6d9270b9f86d 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -89,7 +89,7 @@ public: const css::uno::Reference& rxMainPaneId); ~PresenterController (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void UpdateCurrentSlide (const sal_Int32 nOffset); @@ -138,55 +138,55 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFrameActionListener virtual void SAL_CALL frameAction ( const css::frame::FrameActionEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: typedef ::std::map,rtl::Reference > InstanceContainer; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 10ebaddb7ce7..32efe48441f9 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -54,26 +54,26 @@ public: const css::uno::Reference& rxSlideShowController); virtual ~PresenterCurrentSlideObserver (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XSlideShowListener - virtual void SAL_CALL paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnimationListener - virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL repeat( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL repeat( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::rtl::Reference mpPresenterController; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 24e017f59c9b..ee5d47c91be0 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -49,12 +49,12 @@ public: const css::uno::Reference&rxController, const Action& rAction); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OUString msEventType; diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 8bcaba565c68..c0019a7faa1d 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -57,40 +57,40 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterHelpView (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class TextContainer; diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 7d10b72eb468..a6bb0d38b63e 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -72,7 +72,7 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterNotesView (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Typically called from setCurrentSlide() with the notes page that is associed with the slide given to setCurrentSlide(). @@ -91,50 +91,50 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxViewId; diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index a6f6a2b3d2ac..4a6e0fd33508 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -58,29 +58,29 @@ public: // XPane css::uno::Reference SAL_CALL getWindow (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** Store the bounding box so that when the window is resized or moved @@ -90,7 +90,7 @@ private: virtual void CreateCanvases ( const css::uno::Reference& rxParentWindow, - const css::uno::Reference& rxParentCanvas); + const css::uno::Reference& rxParentCanvas) SAL_OVERRIDE; void Invalidate ( const css::awt::Rectangle& rRepaintBox); diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 76df877f48dd..9f732e7b5d02 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -70,7 +70,7 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterPaneBase (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; css::uno::Reference GetBorderWindow (void) const; void SetBackground (const SharedBitmapDescriptor& rpBackground); @@ -83,34 +83,34 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ::rtl::Reference mpPresenterController; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index bc4de31c77c7..d7322cd60966 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -94,13 +94,13 @@ public: const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paintBorder ( const OUString& rsPaneBorderStyleName, @@ -108,7 +108,7 @@ public: const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, @@ -117,11 +117,11 @@ public: const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Point SAL_CALL getCalloutOffset ( const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxContext; diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index ea79d9bdfc7e..7692858d39b4 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -63,7 +63,7 @@ public: const css::uno::Reference& rxContext); virtual ~PresenterPaneContainer (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; typedef ::boost::function1&> ViewInitializationFunction; @@ -173,7 +173,7 @@ public: virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxPresenterHelper; diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 2b375e6ae440..0a8e4b5cb5a5 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -80,7 +80,7 @@ public: SAL_THROW((css::uno::Exception)); virtual void SAL_CALL disposing (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory @@ -88,13 +88,13 @@ public: SAL_CALL createResource ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, std::exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const ::com::sun::star::uno::Reference& rxPane) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::WeakReference mxComponentContextWeak; diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 75613d59a825..f508e8e15e37 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -59,8 +59,8 @@ namespace { GotoPreviousSlideCommand ( const rtl::Reference& rpPresenterController); virtual ~GotoPreviousSlideCommand (void) {} - virtual void Execute (void); - virtual bool IsEnabled (void) const; + virtual void Execute (void) SAL_OVERRIDE; + virtual bool IsEnabled (void) const SAL_OVERRIDE; private: rtl::Reference mpPresenterController; }; @@ -71,11 +71,11 @@ namespace { GotoNextSlideCommand ( const rtl::Reference& rpPresenterController); virtual ~GotoNextSlideCommand (void) {} - virtual void Execute (void); + virtual void Execute (void) SAL_OVERRIDE; // The next slide command is always enabled, even when the current slide // is the last slide: from the last slide it goes to the pause slide, // and from there it ends the slide show. - virtual bool IsEnabled (void) const { return true; } + virtual bool IsEnabled (void) const SAL_OVERRIDE { return true; } private: rtl::Reference mpPresenterController; }; @@ -86,7 +86,7 @@ namespace { GotoNextEffectCommand ( const rtl::Reference& rpPresenterController); virtual ~GotoNextEffectCommand (void) {} - virtual void Execute (void); + virtual void Execute (void) SAL_OVERRIDE; private: rtl::Reference mpPresenterController; }; @@ -97,7 +97,7 @@ namespace { SwitchMonitorCommand ( const rtl::Reference& rpPresenterController); virtual ~SwitchMonitorCommand (void) {} - virtual void Execute (void); + virtual void Execute (void) SAL_OVERRIDE; private: rtl::Reference mpPresenterController; }; @@ -109,8 +109,8 @@ namespace { const bool bOn, const rtl::Reference& rpPresenterController); virtual ~SetNotesViewCommand (void) {} - virtual void Execute (void); - virtual Any GetState (void) const; + virtual void Execute (void) SAL_OVERRIDE; + virtual Any GetState (void) const SAL_OVERRIDE; private: bool mbOn; rtl::Reference mpPresenterController; @@ -124,8 +124,8 @@ namespace { const bool bOn, const rtl::Reference& rpPresenterController); virtual ~SetSlideSorterCommand (void) {} - virtual void Execute (void); - virtual Any GetState (void) const; + virtual void Execute (void) SAL_OVERRIDE; + virtual Any GetState (void) const SAL_OVERRIDE; private: bool mbOn; rtl::Reference mpPresenterController; @@ -138,8 +138,8 @@ namespace { const bool bOn, const rtl::Reference& rpPresenterController); virtual ~SetHelpViewCommand (void) {} - virtual void Execute (void); - virtual Any GetState (void) const; + virtual void Execute (void) SAL_OVERRIDE; + virtual Any GetState (void) const SAL_OVERRIDE; private: bool mbOn; rtl::Reference mpPresenterController; @@ -152,8 +152,8 @@ namespace { const rtl::Reference& rpPresenterController, const sal_Int32 nSizeChange); virtual ~NotesFontSizeCommand (void) {} - virtual void Execute (void); - virtual Any GetState (void) const; + virtual void Execute (void) SAL_OVERRIDE; + virtual Any GetState (void) const SAL_OVERRIDE; protected: ::rtl::Reference GetNotesView (void) const; private: @@ -184,7 +184,7 @@ public: const OUString& rsURLPath, const ::rtl::Reference& rpPresenterController); - void SAL_CALL disposing (void); + void SAL_CALL disposing (void) SAL_OVERRIDE; static Command* CreateCommand ( const OUString& rsURLPath, const ::rtl::Reference& rpPresenterController); @@ -193,27 +193,27 @@ public: virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence& rArguments) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const css::uno::Reference& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OUString msURLPath; diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index bfea03f9bdbd..6ca16f5a1794 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -47,7 +47,7 @@ public: PresenterProtocolHandler (const css::uno::Reference& rxContext); virtual ~PresenterProtocolHandler (void); - void SAL_CALL disposing (void); + void SAL_CALL disposing (void) SAL_OVERRIDE; static OUString getImplementationName_static (void); static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); @@ -59,7 +59,7 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProvider @@ -68,12 +68,12 @@ public: const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class Dispatch; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index f0f8bc4943f6..35b1a320ba3c 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -70,15 +70,15 @@ namespace { virtual ~PresenterScreenListener (void); void Initialize (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // document::XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxModel; diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 13a145f51c7c..af6cc728b36c 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -66,7 +66,7 @@ public: const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XJob @@ -74,7 +74,7 @@ public: const css::uno::Sequence& Arguments) throw (css::lang::IllegalArgumentException, css::uno::Exception, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PresenterScreenJob (const css::uno::Reference& rxContext); @@ -105,7 +105,7 @@ public: const css::uno::Reference& rxModel); virtual ~PresenterScreen (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; bool isPresenterScreenEnabled( const css::uno::Reference& rxContext); @@ -125,7 +125,7 @@ public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxModel; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 8f4765bbfce3..593b1f52f399 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -58,7 +58,7 @@ public: typedef ::boost::function ThumbMotionListener; virtual ~PresenterScrollBar (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void SetVisible (const bool bIsVisible); @@ -114,47 +114,47 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None, __AreaCount__ = None }; @@ -253,21 +253,21 @@ public: const ::boost::shared_ptr& rpPaintManager, const ::boost::function& rThumbMotionListener); virtual ~PresenterVerticalScrollBar (void); - virtual sal_Int32 GetSize (void) const; + virtual sal_Int32 GetSize (void) const SAL_OVERRIDE; protected: - virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const; - virtual void UpdateDragAnchor (const double nDragDistance); - virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const; - virtual double GetMinor (const double nX, const double nY) const; - virtual void UpdateBorders (void); - virtual void UpdateBitmaps (void); + virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const SAL_OVERRIDE; + virtual void UpdateDragAnchor (const double nDragDistance) SAL_OVERRIDE; + virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const SAL_OVERRIDE; + virtual double GetMinor (const double nX, const double nY) const SAL_OVERRIDE; + virtual void UpdateBorders (void) SAL_OVERRIDE; + virtual void UpdateBitmaps (void) SAL_OVERRIDE; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, const SharedBitmapDescriptor& rpStartBitmaps, const SharedBitmapDescriptor& rpCenterBitmaps, - const SharedBitmapDescriptor& rpEndBitmaps); + const SharedBitmapDescriptor& rpEndBitmaps) SAL_OVERRIDE; private: sal_Int32 mnScrollBarWidth; diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 34768eefe99b..e0bb2a39af7e 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -67,47 +67,47 @@ public: const css::uno::Reference& rxAnchorPane, const ::rtl::Reference& rpPresenterController); virtual ~PresenterSlidePreview (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ::rtl::Reference mpPresenterController; diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 8f9d6d5d2a8e..5fb510a8096c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -72,139 +72,139 @@ public: virtual ~PresenterSlideShowView (void); void LateInit (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // CachablePresenterView - virtual void ReleaseView (void); + virtual void ReleaseView (void) SAL_OVERRIDE; // XSlideShowView virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clear (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset(void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XView virtual css::uno::Reference SAL_CALL getResourceId (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // CachablePresenterView - virtual void ActivatePresenterView (void); + virtual void ActivatePresenterView (void) SAL_OVERRIDE; - virtual void DeactivatePresenterView (void); + virtual void DeactivatePresenterView (void) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 5570942de247..1e3a684e24d2 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -72,7 +72,7 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterSlideSorter (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void SetActiveState (const bool bIsActive); @@ -80,77 +80,77 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener virtual void SAL_CALL propertyChange ( const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSlidePreviewCacheListener virtual void SAL_CALL notifyPreviewCreation ( sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 1526782c2eda..39619e757c70 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -54,7 +54,7 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterSpritePane (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; using css::lang::XEventListener::disposing; @@ -69,29 +69,29 @@ public: // XPane virtual css::uno::Reference SAL_CALL getWindow (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxParentWindow; @@ -100,7 +100,7 @@ private: virtual void CreateCanvases ( const css::uno::Reference& rxParentWindow, - const css::uno::Reference& rxParentCanvas); + const css::uno::Reference& rxParentCanvas) SAL_OVERRIDE; void UpdateCanvases (void); }; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 27cf782c1cef..96668e91cf7a 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -107,8 +107,8 @@ private: class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; friend class Deleter; - virtual void SAL_CALL run (void); - virtual void SAL_CALL onTerminated (void) { mpLateDestroy.reset(); } + virtual void SAL_CALL run (void) SAL_OVERRIDE; + virtual void SAL_CALL onTerminated (void) SAL_OVERRIDE { mpLateDestroy.reset(); } }; } // end of anonymous namespace diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 0092388bd0f1..14f19391811a 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -94,7 +94,7 @@ public: // XCallback virtual void SAL_CALL notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: static ::rtl::Reference mpInstance; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index a025ebf263f0..470ef3d92c50 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -135,7 +135,7 @@ namespace { Element (const ::rtl::Reference& rpToolBar); virtual ~Element (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual void SetModes ( const SharedElementMode& rpNormalMode, @@ -160,17 +160,17 @@ namespace { // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ::rtl::Reference mpToolBar; @@ -211,20 +211,20 @@ namespace { const ::rtl::Reference& rpToolBar); virtual ~Button (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual void Paint ( const Reference& rxCanvas, - const rendering::ViewState& rViewState); + const rendering::ViewState& rViewState) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( - const Reference& rxCanvas); + const Reference& rxCanvas) SAL_OVERRIDE; private: bool mbIsListenerRegistered; @@ -248,12 +248,12 @@ namespace { void SetText (const OUString& rsText); virtual void Paint ( const Reference& rxCanvas, - const rendering::ViewState& rViewState); - virtual bool SetState (const bool bIsOver, const bool bIsPressed); + const rendering::ViewState& rViewState) SAL_OVERRIDE; + virtual bool SetState (const bool bIsOver, const bool bIsPressed) SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( - const Reference& rxCanvas); + const Reference& rxCanvas) SAL_OVERRIDE; }; // Some specialized controls. @@ -277,7 +277,7 @@ namespace { protected: TimeLabel(const ::rtl::Reference& rpToolBar); using Element::disposing; - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; private: class Listener : public PresenterClockTimer::Listener { @@ -285,7 +285,7 @@ namespace { Listener (const ::rtl::Reference& rxLabel) : mxLabel(rxLabel) {} virtual ~Listener (void) {} - virtual void TimeHasChanged (const oslDateTime& rCurrentTime) + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE { if (mxLabel.is()) mxLabel->TimeHasChanged(rCurrentTime); } private: ::rtl::Reference mxLabel; @@ -302,12 +302,12 @@ namespace { const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, - const SharedElementMode& rpDisabledMode); + const SharedElementMode& rpDisabledMode) SAL_OVERRIDE; private: TimeFormatter maTimeFormatter; CurrentTimeLabel (const ::rtl::Reference& rpToolBar); virtual ~CurrentTimeLabel (void); - virtual void TimeHasChanged (const oslDateTime& rCurrentTime); + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; class PresentationTimeLabel : public TimeLabel @@ -319,13 +319,13 @@ namespace { const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, - const SharedElementMode& rpDisabledMode); + const SharedElementMode& rpDisabledMode) SAL_OVERRIDE; private: TimeFormatter maTimeFormatter; TimeValue maStartTimeValue; PresentationTimeLabel (const ::rtl::Reference& rpToolBar); virtual ~PresentationTimeLabel (void); - virtual void TimeHasChanged (const oslDateTime& rCurrentTime); + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; class VerticalSeparator : public Element @@ -334,12 +334,12 @@ namespace { explicit VerticalSeparator (const ::rtl::Reference& rpToolBar); virtual void Paint ( const Reference& rxCanvas, - const rendering::ViewState& rViewState); - virtual bool IsFilling (void) const; + const rendering::ViewState& rViewState) SAL_OVERRIDE; + virtual bool IsFilling (void) const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( - const Reference& rxCanvas); + const Reference& rxCanvas) SAL_OVERRIDE; }; class HorizontalSeparator : public Element @@ -348,12 +348,12 @@ namespace { explicit HorizontalSeparator (const ::rtl::Reference& rpToolBar); virtual void Paint ( const Reference& rxCanvas, - const rendering::ViewState& rViewState); - virtual bool IsFilling (void) const; + const rendering::ViewState& rViewState) SAL_OVERRIDE; + virtual bool IsFilling (void) const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( - const Reference& rxCanvas); + const Reference& rxCanvas) SAL_OVERRIDE; }; } // end of anonymous namespace diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 1cee3358b70e..1bb8b08f58ef 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -91,7 +91,7 @@ public: void Initialize ( const OUString& rsConfigurationPath); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void InvalidateArea ( const css::awt::Rectangle& rRepaintBox, @@ -106,57 +106,57 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; class Context; @@ -234,37 +234,37 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterToolBarView (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; ::rtl::Reference GetPresenterToolBar (void) const; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId virtual css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: // css::uno::Reference mxComponentContext; diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 8fed8d08567d..463a35bce800 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -77,7 +77,7 @@ public: virtual ~NextSlidePreview (void) {} virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { Reference xSlideShowController ( mpPresenterController->GetSlideShowController()); diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 6a083a7a021b..649ddfae3868 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -105,19 +105,19 @@ public: SAL_THROW((css::uno::Exception)); virtual void SAL_CALL disposing (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory virtual css::uno::Reference SAL_CALL createResource ( const css::uno::Reference& rxViewId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference& rxPane) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 83c148db1b43..343d75c1e8db 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -73,7 +73,7 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterWindowManager (void); - void SAL_CALL disposing (void); + void SAL_CALL disposing (void) SAL_OVERRIDE; void SetParentPane (const css::uno::Reference& rxPane); void SetTheme (const ::boost::shared_ptr& rpTheme); @@ -117,49 +117,49 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; -- cgit