diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /sdext | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sdext')
51 files changed, 621 insertions, 621 deletions
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 174b603cccee..d754bc5d7022 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -75,8 +75,8 @@ class OKActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListene public: explicit OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: InformationDialog& mrInformationDialog; diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index a88e0cc7f673..6f6542684d15 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -133,8 +133,8 @@ class ItemListener : public ::cppu::WeakImplHelper< css::awt::XItemListener > public: explicit ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; @@ -147,8 +147,8 @@ class ActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener public: explicit ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; @@ -161,8 +161,8 @@ class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper< css::awt::XActi public: explicit ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; @@ -175,8 +175,8 @@ class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt:: public: explicit TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; @@ -189,8 +189,8 @@ class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextL public: explicit TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; @@ -203,11 +203,11 @@ class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt:: public: explicit SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; private: OptimizerDialog& mrOptimizerDialog; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index efda6713fc14..6b83c180e3a7 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -48,22 +48,22 @@ public: // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static sal_Int64 GetFileSize( const OUString& rURL ); }; diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index e595dc962de0..203b66c8f257 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -58,37 +58,37 @@ public: // XInitialization void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; }; OUString PPPOptimizerDialog_getImplementationName(); diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index d695617d348a..c57d9300aabd 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -59,10 +59,10 @@ public: const pdfparse::PDFContainer* pTop ); virtual ~FileEmitContext(); - 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; + virtual bool write( const void* pBuf, unsigned int nLen ) override; + virtual unsigned int getCurPos() override; + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) override; + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) 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 fede97c8dce8..c2af1d257ee1 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -50,16 +50,16 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& io_rDescriptor ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index d1909e7e2294..110e45d38a04 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -73,8 +73,8 @@ struct PDFComment : public PDFEntry explicit PDFComment( const OString& rComment ) : PDFEntry(), m_aComment( rComment ) {} virtual ~PDFComment(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFValue : public PDFEntry @@ -91,8 +91,8 @@ struct PDFName : public PDFValue explicit PDFName( const OString& rName ) : PDFValue(), m_aName( rName ) {} virtual ~PDFName(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; OUString getFilteredName() const; }; @@ -104,8 +104,8 @@ struct PDFString : public PDFValue explicit PDFString( const OString& rString ) : PDFValue(), m_aString( rString ) {} virtual ~PDFString(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; OString getFilteredString() const; }; @@ -117,8 +117,8 @@ struct PDFNumber : public PDFValue explicit PDFNumber( double fVal ) : PDFValue(), m_fValue( fVal ) {} virtual ~PDFNumber(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFBool : public PDFValue @@ -128,8 +128,8 @@ struct PDFBool : public PDFValue explicit PDFBool( bool bVal ) : PDFValue(), m_bValue( bVal ) {} virtual ~PDFBool(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const 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 SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFNull : public PDFValue { PDFNull() {} virtual ~PDFNull(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFObject; @@ -174,8 +174,8 @@ struct PDFArray : public PDFContainer { PDFArray() {} virtual ~PDFArray(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFDict : public PDFContainer @@ -185,8 +185,8 @@ struct PDFDict : public PDFContainer PDFDict() {} virtual ~PDFDict(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const 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 SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const 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 SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; struct PDFFileImplData; @@ -240,8 +240,8 @@ public: {} virtual ~PDFFile(); - virtual bool emit( EmitContext& rWriteContext ) const SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const 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 SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const 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 SAL_OVERRIDE; - virtual PDFEntry* clone() const SAL_OVERRIDE; + virtual bool emit( EmitContext& rWriteContext ) const override; + virtual PDFEntry* clone() const override; }; class PDFReader diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index b06c8c3fbb12..48c9a7570ddf 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) SAL_OVERRIDE; - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception) override; // XInteractionPassword - 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; + virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception) override; // XInteractionContinuation - virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) 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) SAL_OVERRIDE { + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) 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_OVERRIDE { + SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) 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 4f90a8227b57..bf1a148f10ea 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -42,9 +42,9 @@ private: public: explicit OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ); - 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; + virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) override; + virtual void write( const OUString& rString ) override; + virtual void endTag( const char* pTag ) override; }; OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) : diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index ab25dc288cd4..180a6e86bcb2 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -59,21 +59,21 @@ namespace pdfi css::uno::XComponentContext >& xContext ); // XFilter - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(std::exception) override; // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) - throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + throw( css::lang::IllegalArgumentException, std::exception ) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakComponentImplHelper< @@ -133,20 +133,20 @@ namespace pdfi // XImportFilter virtual sal_Bool SAL_CALL importer( const css::uno::Sequence< css::beans::PropertyValue >& rSourceData, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHdl, - const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) override; // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) - throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + throw( css::lang::IllegalArgumentException, std::exception ) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index cacbab097e78..d4b92be4a833 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() SAL_OVERRIDE + virtual bool write( const void* pBuf, unsigned int nLen ) throw() override { m_aBuf.append( static_cast<const sal_Char*>(pBuf), nLen ); return true; } - virtual unsigned int getCurPos() throw() SAL_OVERRIDE { return m_aBuf.getLength(); } - virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() SAL_OVERRIDE + virtual unsigned int getCurPos() throw() override { return m_aBuf.getLength(); } + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() override { return (nOrigOffset+nLen < static_cast<unsigned int>(m_aBuf.getLength()) ) && write( m_aBuf.getStr() + nOrigOffset, nLen ); } - virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() SAL_OVERRIDE + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() override { if( nOrigOffset+nLen < static_cast<unsigned int>(m_aBuf.getLength()) ) { diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index a93d904c467a..b0e198f1248a 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -40,9 +40,9 @@ namespace pdfi css::xml::sax::XDocumentHandler >& xDocHdl ); virtual ~SaxEmitter(); - 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; + virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) override; + virtual void write( const OUString& rString ) override; + virtual void endTag( const char* pTag ) override; }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 097a752afa07..c8c76f34fffa 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -53,15 +53,15 @@ namespace pdfi virtual ~SaxAttrList(); // css::xml::sax::XAttributeList - 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; + virtual sal_Int16 SAL_CALL getLength() throw(std::exception) override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) override; // css::util::XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) override; }; } diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index ad166af359d8..015a3e288e88 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper< maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } - virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { maFile.close(); } diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 1aa5a6cd8d41..852c3a74efba 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() 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; + virtual bool write( const void* pBuf, unsigned int nLen ) throw() override; + virtual unsigned int getCurPos() throw() override; + virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw() override; + virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) throw() 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 2bd9a87b0197..027c8ccd9304 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -117,40 +117,40 @@ namespace GraphicsContext& getCurrentContext() { return m_aGCStack.back(); } // ContentSink interface implementation - virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE + virtual void setPageNum( sal_Int32 nNumPages ) override { m_nNumPages = nNumPages; } - virtual void startPage( const geometry::RealSize2D& rSize ) SAL_OVERRIDE + virtual void startPage( const geometry::RealSize2D& rSize ) override { m_aPageSize = rSize; } - virtual void endPage() SAL_OVERRIDE + virtual void endPage() override { m_bPageEnded = true; } virtual void hyperLink( const geometry::RealRectangle2D& rBounds, - const OUString& rURI ) SAL_OVERRIDE + const OUString& rURI ) override { m_aHyperlinkBounds = rBounds; m_aURI = rURI; } - virtual void pushState() SAL_OVERRIDE + virtual void pushState() override { GraphicsContextStack::value_type const a(m_aGCStack.back()); m_aGCStack.push_back(a); } - virtual void popState() SAL_OVERRIDE + virtual void popState() override { m_aGCStack.pop_back(); } - virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE + virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) override { basegfx::unotools::homMatrixFromAffineMatrix( getCurrentContext().Transformation, @@ -158,7 +158,7 @@ namespace } virtual void setLineDash( const uno::Sequence<double>& dashes, - double start ) SAL_OVERRIDE + double start ) override { GraphicsContext& rContext( getCurrentContext() ); if( dashes.getLength() ) @@ -166,42 +166,42 @@ namespace CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "line dashing start offset", 0.0, start, 0.000000001 ); } - virtual void setFlatness( double nFlatness ) SAL_OVERRIDE + virtual void setFlatness( double nFlatness ) override { getCurrentContext().Flatness = nFlatness; } - virtual void setLineJoin(sal_Int8 nJoin) SAL_OVERRIDE + virtual void setLineJoin(sal_Int8 nJoin) override { getCurrentContext().LineJoin = nJoin; } - virtual void setLineCap(sal_Int8 nCap) SAL_OVERRIDE + virtual void setLineCap(sal_Int8 nCap) override { getCurrentContext().LineCap = nCap; } - virtual void setMiterLimit(double nVal) SAL_OVERRIDE + virtual void setMiterLimit(double nVal) override { getCurrentContext().MiterLimit = nVal; } - virtual void setLineWidth(double nVal) SAL_OVERRIDE + virtual void setLineWidth(double nVal) override { getCurrentContext().LineWidth = nVal; } - virtual void setFillColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE + virtual void setFillColor( const rendering::ARGBColor& rColor ) override { getCurrentContext().FillColor = rColor; } - virtual void setStrokeColor( const rendering::ARGBColor& rColor ) SAL_OVERRIDE + virtual void setStrokeColor( const rendering::ARGBColor& rColor ) override { getCurrentContext().LineColor = rColor; } - virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE + virtual void setFont( const FontAttributes& rFont ) override { FontToIdMap::const_iterator it = m_aFontToId.find( rFont ); if( it != m_aFontToId.end() ) @@ -215,7 +215,7 @@ namespace } } - virtual void strokePath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE + virtual void strokePath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) override { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -274,7 +274,7 @@ namespace (sal_Int32) 0, rContext.FontId ); } - virtual void fillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE + virtual void fillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) override { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -293,7 +293,7 @@ namespace (sal_Int32) 0, rContext.FontId ); } - virtual void eoFillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) SAL_OVERRIDE + virtual void eoFillPath( const uno::Reference<rendering::XPolyPolygon2D>& rPath ) override { GraphicsContext& rContext( getCurrentContext() ); basegfx::B2DPolyPolygon aPath = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); @@ -319,7 +319,7 @@ namespace m_bRedCircleSeen = true; } - virtual void intersectClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) SAL_OVERRIDE + virtual void intersectClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) override { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; @@ -330,7 +330,7 @@ namespace getCurrentContext().Clip = aNewClip; } - virtual void intersectEoClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) SAL_OVERRIDE + virtual void intersectEoClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) override { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; @@ -344,18 +344,18 @@ namespace virtual void drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& /*rRect*/, const geometry::Matrix2D& /*rFontMatrix*/, - double /*fontSize*/) SAL_OVERRIDE + double /*fontSize*/) override { m_aTextOut.append(rGlyphs); } - virtual void endText() SAL_OVERRIDE + virtual void endText() override { m_aTextOut.append( "\n" ); } virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap, - bool /*bInvert*/ ) SAL_OVERRIDE + bool /*bInvert*/ ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties", (sal_Int32) 3, xBitmap.getLength() ); @@ -365,7 +365,7 @@ namespace xBitmap[1].Name == "InputStream" ); } - virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap ) SAL_OVERRIDE + virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage received two properties", (sal_Int32) 3, xBitmap.getLength() ); @@ -377,7 +377,7 @@ namespace } virtual void drawColorMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap, - const uno::Sequence<uno::Any>& /*xMaskColors*/ ) SAL_OVERRIDE + const uno::Sequence<uno::Any>& /*xMaskColors*/ ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage received two properties", (sal_Int32) 3, xBitmap.getLength() ); @@ -389,7 +389,7 @@ namespace virtual void drawMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap, const uno::Sequence<beans::PropertyValue>& xMask, - bool /*bInvertMask*/) SAL_OVERRIDE + bool /*bInvertMask*/) override { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two properties #1", (sal_Int32) 3, xBitmap.getLength() ); @@ -407,7 +407,7 @@ namespace } virtual void drawAlphaMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap, - const uno::Sequence<beans::PropertyValue>& xMask) SAL_OVERRIDE + const uno::Sequence<beans::PropertyValue>& xMask) override { CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage received two properties #1", (sal_Int32) 3, xBitmap.getLength() ); @@ -424,7 +424,7 @@ namespace xMask[1].Name == "InputStream" ); } - virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE + virtual void setTextRenderMode( sal_Int32 ) override { } diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index dd09f4ceb26a..73aac5a706e8 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& ) 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; class DrawXmlFinalizer : public ElementTreeVisitor @@ -67,14 +67,14 @@ namespace pdfi m_rProcessor(rProcessor) {} - 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; class DrawXmlEmitter : public ElementTreeVisitor @@ -103,14 +103,14 @@ namespace pdfi m_bWriteDrawDocument(eDocType==DRAW_DOC) {} - 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; } diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index c8da275696df..8a2038c2634d 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -111,7 +111,7 @@ namespace pdfi struct ListElement : public Element { ListElement() : Element( NULL ) {} - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; }; struct HyperlinkElement : public Element @@ -121,7 +121,7 @@ namespace pdfi HyperlinkElement( Element* pParent, const OUString& rURI ) : Element( pParent ), URI( rURI ) {} public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; OUString URI; }; @@ -166,7 +166,7 @@ namespace pdfi : DrawElement( pParent, nGCId ) {} public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; }; struct TextElement : public GraphicalElement @@ -177,7 +177,7 @@ namespace pdfi : GraphicalElement( pParent, nGCId ), FontId( nFontId ) {} public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; OUStringBuffer Text; sal_Int32 FontId; @@ -190,7 +190,7 @@ namespace pdfi explicit ParagraphElement( Element* pParent ) : Element( pParent ), Type( Normal ), bRtl( false ) {} public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) override; // returns true only if only a single line is contained bool isSingleLined( PDFIProcessor& rProc ) const; @@ -213,7 +213,7 @@ namespace pdfi const basegfx::B2DPolyPolygon& rPolyPoly, sal_Int8 nAction ); public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) override; void updateGeometry(); @@ -233,7 +233,7 @@ namespace pdfi : DrawElement( pParent, nGCId ), Image( nImage ) {} public: - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; ImageId Image; }; @@ -253,7 +253,7 @@ namespace pdfi public: virtual ~PageElement(); - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) override; static void updateParagraphGeometry( Element* pEle ); void resolveHyperlinks(); @@ -278,7 +278,7 @@ namespace pdfi public: virtual ~DocumentElement(); - virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) SAL_OVERRIDE; + virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override; }; // this class is the differentiator of document types: it will create diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 527205147a7c..dc7da62837fb 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -99,51 +99,51 @@ namespace pdfi // ContentSink interface implementation - virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE; - virtual void startPage( const css::geometry::RealSize2D& rSize ) SAL_OVERRIDE; - virtual void endPage() SAL_OVERRIDE; + virtual void setPageNum( sal_Int32 nNumPages ) override; + virtual void startPage( const css::geometry::RealSize2D& rSize ) override; + virtual void endPage() override; virtual void hyperLink( const css::geometry::RealRectangle2D& rBounds, - 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 css::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE; + const OUString& rURI ) override; + virtual void pushState() override; + virtual void popState() override; + virtual void setFlatness( double ) override; + virtual void setTransformation( const css::geometry::AffineMatrix2D& rMatrix ) override; virtual void setLineDash( const css::uno::Sequence<double>& dashes, - 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 css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; - virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; - virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE; - virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE; + double start ) override; + virtual void setLineJoin(sal_Int8) override; + virtual void setLineCap(sal_Int8) override; + virtual void setMiterLimit(double) override; + virtual void setLineWidth(double) override; + virtual void setFillColor( const css::rendering::ARGBColor& rColor ) override; + virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) override; + virtual void setFont( const FontAttributes& rFont ) override; + virtual void setTextRenderMode( sal_Int32 ) override; virtual void strokePath( const css::uno::Reference< - css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + css::rendering::XPolyPolygon2D >& rPath ) override; virtual void fillPath( const css::uno::Reference< - css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + css::rendering::XPolyPolygon2D >& rPath ) override; virtual void eoFillPath( const css::uno::Reference< - css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + css::rendering::XPolyPolygon2D >& rPath ) override; virtual void intersectClip(const css::uno::Reference< - css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; + css::rendering::XPolyPolygon2D >& rPath) override; virtual void intersectEoClip(const css::uno::Reference< - css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; + css::rendering::XPolyPolygon2D >& rPath) override; virtual void drawGlyphs( const OUString& rGlyphs, const css::geometry::RealRectangle2D& rRect, const css::geometry::Matrix2D& rFontMatrix, - double fontSize) SAL_OVERRIDE; - virtual void endText() SAL_OVERRIDE; + double fontSize) override; + virtual void endText() override; virtual void drawMask(const css::uno::Sequence< css::beans::PropertyValue>& xBitmap, - bool bInvert ) SAL_OVERRIDE; + bool bInvert ) override; /// Given image must already be color-mapped and normalized to sRGB. virtual void drawImage(const css::uno::Sequence< - css::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE; + css::beans::PropertyValue>& xBitmap ) override; /** Given image must already be color-mapped and normalized to sRGB. maskColors must contain two sequences of color components @@ -151,16 +151,16 @@ namespace pdfi virtual void drawColorMaskedImage(const css::uno::Sequence< css::beans::PropertyValue>& xBitmap, const css::uno::Sequence< - css::uno::Any>& xMaskColors ) SAL_OVERRIDE; + css::uno::Any>& xMaskColors ) override; virtual void drawMaskedImage(const css::uno::Sequence< css::beans::PropertyValue>& xBitmap, const css::uno::Sequence< css::beans::PropertyValue>& xMask, - bool bInvertMask) SAL_OVERRIDE; + bool bInvertMask) override; virtual void drawAlphaMaskedImage(const css::uno::Sequence< css::beans::PropertyValue>& xImage, const css::uno::Sequence< - css::beans::PropertyValue>& xMask) SAL_OVERRIDE; + css::beans::PropertyValue>& xMask) 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 8d4f1fc31ac1..7becdf5dd613 100644 --- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx +++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx @@ -28,19 +28,19 @@ namespace pdfi { WriterTreeVisitorFactory() {} - virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const override { return std::shared_ptr<ElementTreeVisitor>(new WriterXmlOptimizer(rProc)); } virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const SAL_OVERRIDE + PDFIProcessor& rProc ) const override { return std::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc)); } - virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const override { return std::shared_ptr<ElementTreeVisitor>(new WriterXmlEmitter(rEmitContext)); } @@ -50,19 +50,19 @@ namespace pdfi { ImpressTreeVisitorFactory() {} - virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc)); } virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const SAL_OVERRIDE + PDFIProcessor& rProc ) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc)); } - virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext, DrawXmlEmitter::IMPRESS_DOC @@ -74,19 +74,19 @@ namespace pdfi { DrawTreeVisitorFactory() {} - virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc)); } virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor( StyleContainer& rStyles, - PDFIProcessor& rProc ) const SAL_OVERRIDE + PDFIProcessor& rProc ) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc)); } - virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE + virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const override { return std::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext, DrawXmlEmitter::DRAW_DOC diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index fd74363d43f6..ea6fca23ec8b 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& ) 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; class WriterXmlFinalizer : public ElementTreeVisitor @@ -69,14 +69,14 @@ namespace pdfi virtual ~WriterXmlFinalizer() {} - 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; class WriterXmlEmitter : public ElementTreeVisitor @@ -94,14 +94,14 @@ namespace pdfi virtual ~WriterXmlEmitter() {} - 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; + virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( TextElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ParagraphElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( FrameElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PolyPolyElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( ImageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( PageElement&, const std::list< Element* >::const_iterator& ) override; + virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator& ) override; }; } diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 4336f8aaae6a..68a291c11c5c 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -164,81 +164,81 @@ namespace pdfi // Does this device use upside-down coordinates? // (Upside-down means (0,0) is the top left corner of the page.) - virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; } + virtual GBool upsideDown() override { return gTrue; } // Does this device use drawChar() or drawString()? - virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; } + virtual GBool useDrawChar() override { return gTrue; } // Does this device use beginType3Char/endType3Char? Otherwise, // text in Type 3 fonts will be drawn with drawChar/drawString. - virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; } + virtual GBool interpretType3Chars() override { return gFalse; } // Does this device need non-text content? - virtual GBool needNonText() SAL_OVERRIDE { return gTrue; } + virtual GBool needNonText() override { return gTrue; } //----- initialization and control // Set default transform matrix. - virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE; + virtual void setDefaultCTM(double *ctm) override; // Start a page. virtual void startPage(int pageNum, GfxState *state #if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0) , XRef *xref #endif - ) SAL_OVERRIDE; + ) override; // End a page. - virtual void endPage() SAL_OVERRIDE; + virtual void endPage() override; //----- link borders #if POPPLER_CHECK_VERSION(0, 19, 0) - virtual void processLink(AnnotLink *link) SAL_OVERRIDE; + virtual void processLink(AnnotLink *link) override; #elif POPPLER_CHECK_VERSION(0, 17, 0) - virtual void processLink(AnnotLink *link, Catalog *catalog) SAL_OVERRIDE; + virtual void processLink(AnnotLink *link, Catalog *catalog) override; #else - virtual void processLink(Link *link, Catalog *catalog) SAL_OVERRIDE; + virtual void processLink(Link *link, Catalog *catalog) override; #endif //----- save/restore graphics state - virtual void saveState(GfxState *state) SAL_OVERRIDE; - virtual void restoreState(GfxState *state) SAL_OVERRIDE; + virtual void saveState(GfxState *state) override; + virtual void restoreState(GfxState *state) override; //----- update graphics state virtual void updateCTM(GfxState *state, double m11, double m12, - double m21, double m22, double m31, double m32) SAL_OVERRIDE; - virtual void updateLineDash(GfxState *state) SAL_OVERRIDE; - virtual void updateFlatness(GfxState *state) SAL_OVERRIDE; - virtual void updateLineJoin(GfxState *state) SAL_OVERRIDE; - virtual void updateLineCap(GfxState *state) SAL_OVERRIDE; - virtual void updateMiterLimit(GfxState *state) SAL_OVERRIDE; - virtual void updateLineWidth(GfxState *state) SAL_OVERRIDE; - virtual void updateFillColor(GfxState *state) SAL_OVERRIDE; - virtual void updateStrokeColor(GfxState *state) SAL_OVERRIDE; - virtual void updateFillOpacity(GfxState *state) SAL_OVERRIDE; - virtual void updateStrokeOpacity(GfxState *state) SAL_OVERRIDE; - virtual void updateBlendMode(GfxState *state) SAL_OVERRIDE; + double m21, double m22, double m31, double m32) override; + virtual void updateLineDash(GfxState *state) override; + virtual void updateFlatness(GfxState *state) override; + virtual void updateLineJoin(GfxState *state) override; + virtual void updateLineCap(GfxState *state) override; + virtual void updateMiterLimit(GfxState *state) override; + virtual void updateLineWidth(GfxState *state) override; + virtual void updateFillColor(GfxState *state) override; + virtual void updateStrokeColor(GfxState *state) override; + virtual void updateFillOpacity(GfxState *state) override; + virtual void updateStrokeOpacity(GfxState *state) override; + virtual void updateBlendMode(GfxState *state) override; //----- update text state - virtual void updateFont(GfxState *state) SAL_OVERRIDE; - virtual void updateRender(GfxState *state) SAL_OVERRIDE; + virtual void updateFont(GfxState *state) override; + virtual void updateRender(GfxState *state) override; //----- path painting - virtual void stroke(GfxState *state) SAL_OVERRIDE; - virtual void fill(GfxState *state) SAL_OVERRIDE; - virtual void eoFill(GfxState *state) SAL_OVERRIDE; + virtual void stroke(GfxState *state) override; + virtual void fill(GfxState *state) override; + virtual void eoFill(GfxState *state) override; //----- path clipping - virtual void clip(GfxState *state) SAL_OVERRIDE; - virtual void eoClip(GfxState *state) SAL_OVERRIDE; + virtual void clip(GfxState *state) override; + virtual void eoClip(GfxState *state) override; //----- text drawing virtual void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE; - virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE; - virtual void endTextObject(GfxState *state) SAL_OVERRIDE; + CharCode code, int nBytes, Unicode *u, int uLen) override; + virtual void drawString(GfxState *state, GooString *s) override; + virtual void endTextObject(GfxState *state) override; //----- image drawing virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, @@ -246,13 +246,13 @@ namespace pdfi #if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, #endif - GBool inlineImg) SAL_OVERRIDE; + GBool inlineImg) override; virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, #if POPPLER_CHECK_VERSION(0, 12, 0) GBool interpolate, #endif - int *maskColors, GBool inlineImg) SAL_OVERRIDE; + int *maskColors, GBool inlineImg) override; virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, @@ -264,7 +264,7 @@ namespace pdfi #if POPPLER_CHECK_VERSION(0, 12, 0) , GBool maskInterpolate #endif - ) SAL_OVERRIDE; + ) override; virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, @@ -277,7 +277,7 @@ namespace pdfi #if POPPLER_CHECK_VERSION(0, 12, 0) , GBool maskInterpolate #endif - ) SAL_OVERRIDE; + ) override; static void setPageNum( int nNumPages ); void setSkipImages ( bool bSkipImages ); diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 5d07ed808d55..91c7d86607a8 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -79,7 +79,7 @@ public: const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild); void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); @@ -98,104 +98,104 @@ public: virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XAccessibleContext ---------------------------------------------- virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleAtPoint ( const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XWindowListener --------------------------------------------------- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; protected: OUString msName; @@ -244,16 +244,16 @@ public: //----- XAccessibleStateSet ----------------------------------------------- virtual sal_Bool SAL_CALL isEmpty() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL contains (sal_Int16 nState) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: const sal_Int32 mnStateSet; @@ -282,16 +282,16 @@ public: //----- XAccessibleRelationSet -------------------------------------------- virtual sal_Int32 SAL_CALL getRelationCount() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) - throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: ::std::vector<AccessibleRelation> maRelations; @@ -323,83 +323,83 @@ public: virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XAccessibleText --------------------------------------------------- virtual sal_Int32 SAL_CALL getCaretPosition() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, const css::uno::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getCharacterCount() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSelectedText() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectionStart() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectionEnd() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; protected: - virtual awt::Point GetRelativeLocation() SAL_OVERRIDE; - virtual awt::Size GetSize() SAL_OVERRIDE; - virtual awt::Point GetAbsoluteParentLocation() SAL_OVERRIDE; - virtual bool GetWindowState (const sal_Int16 nType) const SAL_OVERRIDE; + virtual awt::Point GetRelativeLocation() override; + virtual awt::Size GetSize() override; + virtual awt::Point GetAbsoluteParentLocation() override; + virtual bool GetWindowState (const sal_Int16 nType) const override; private: SharedPresenterTextParagraph mpParagraph; @@ -488,7 +488,7 @@ public: virtual void SetWindow ( const css::uno::Reference<css::awt::XWindow>& rxContentWindow, - const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) SAL_OVERRIDE; + const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) override; private: std::shared_ptr<PresenterTextView> mpTextView; diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 590feed60c21..fb7d4d6288cb 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -70,31 +70,31 @@ public: const sal_Int32 nCurrentSlideIndex, const sal_Int32 nSlideCount); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XFocusListener ---------------------------------------------------- virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //----- XInitialization --------------------------------------------------- virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 5ab424b9ea31..5200e2c3caf6 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -66,7 +66,7 @@ public: const OUString& rsConfigurationName); virtual ~PresenterButton(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() 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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 06548f0b213c..44ada20a216f 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -97,7 +97,7 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId); virtual ~PresenterController(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void UpdateCurrentSlide (const sal_Int32 nOffset); @@ -148,55 +148,55 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XFrameActionListener virtual void SAL_CALL frameAction ( const css::frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: typedef ::std::map<css::uno::Reference<css::frame::XFrame>,rtl::Reference<PresenterController> > InstanceContainer; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 57c0c90d1a55..55b11c781796 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -54,26 +54,26 @@ public: const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController); virtual ~PresenterCurrentSlideObserver(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XSlideShowListener - virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException, std::exception) override; // XAnimationListener - virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 64e4e71f7e53..5ce5bcf39d4a 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -51,12 +51,12 @@ public: const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, const Action& rAction); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index bbff6e262e5a..4d9700726c1d 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -57,40 +57,40 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterHelpView(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: class TextContainer; diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 687311cc11c4..418087d2777b 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -72,7 +72,7 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterNotesView(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; /** Typically called from setCurrentSlide() with the notes page that is associeted 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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 2afa1497d283..d2706b026658 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -52,29 +52,29 @@ public: // XPane css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: /** Store the bounding box so that when the window is resized or moved @@ -84,7 +84,7 @@ private: virtual void CreateCanvases ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) SAL_OVERRIDE; + const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) override; void Invalidate ( const css::awt::Rectangle& rRepaintBox); diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index f93d6c1d7846..ee189703d70e 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -69,7 +69,7 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPaneBase(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; css::uno::Reference<css::awt::XWindow> GetBorderWindow() const; void SetBackground (const SharedBitmapDescriptor& rpBackground); @@ -82,34 +82,34 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; protected: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 13010652764c..a89103091be4 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -93,13 +93,13 @@ public: const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL paintBorder ( const OUString& rsPaneBorderStyleName, @@ -107,7 +107,7 @@ public: const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, @@ -116,11 +116,11 @@ public: const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::awt::Point SAL_CALL getCalloutOffset ( const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::uno::XComponentContext> mxContext; diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 18a7a1f8597c..2cf299de1266 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -65,7 +65,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~PresenterPaneContainer(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; typedef ::std::function<void (const css::uno::Reference<css::drawing::framework::XView>&)> ViewInitializationFunction; @@ -173,7 +173,7 @@ public: virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 3821db724a71..c7dda3c16a50 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -74,7 +74,7 @@ public: virtual ~PresenterPaneFactory(); virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) SAL_OVERRIDE; + throw (css::uno::RuntimeException) override; // XResourceFactory @@ -82,13 +82,13 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxPaneId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::WeakReference<css::uno::XComponentContext> mxComponentContextWeak; diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 709a22e66e2d..26537afb9322 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -61,8 +61,8 @@ namespace { explicit GotoPreviousSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); virtual ~GotoPreviousSlideCommand() {} - virtual void Execute() SAL_OVERRIDE; - virtual bool IsEnabled() const SAL_OVERRIDE; + virtual void Execute() override; + virtual bool IsEnabled() const override; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -73,11 +73,11 @@ namespace { explicit GotoNextSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); virtual ~GotoNextSlideCommand() {} - virtual void Execute() SAL_OVERRIDE; + virtual void Execute() 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() const SAL_OVERRIDE { return true; } + virtual bool IsEnabled() const override { return true; } private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -88,7 +88,7 @@ namespace { explicit GotoNextEffectCommand ( const rtl::Reference<PresenterController>& rpPresenterController); virtual ~GotoNextEffectCommand() {} - virtual void Execute() SAL_OVERRIDE; + virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -99,7 +99,7 @@ namespace { explicit SwitchMonitorCommand ( const rtl::Reference<PresenterController>& rpPresenterController); virtual ~SwitchMonitorCommand() {} - virtual void Execute() SAL_OVERRIDE; + virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -110,7 +110,7 @@ namespace { public: explicit RestartTimerCommand(const rtl::Reference<PresenterController>& rpPresenterController); virtual ~RestartTimerCommand(); - virtual void Execute() SAL_OVERRIDE; + virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -122,8 +122,8 @@ namespace { const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); virtual ~SetNotesViewCommand() {} - virtual void Execute() SAL_OVERRIDE; - virtual Any GetState() const SAL_OVERRIDE; + virtual void Execute() override; + virtual Any GetState() const override; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -137,8 +137,8 @@ namespace { const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); virtual ~SetSlideSorterCommand() {} - virtual void Execute() SAL_OVERRIDE; - virtual Any GetState() const SAL_OVERRIDE; + virtual void Execute() override; + virtual Any GetState() const override; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -151,8 +151,8 @@ namespace { const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); virtual ~SetHelpViewCommand() {} - virtual void Execute() SAL_OVERRIDE; - virtual Any GetState() const SAL_OVERRIDE; + virtual void Execute() override; + virtual Any GetState() const override; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -165,8 +165,8 @@ namespace { const rtl::Reference<PresenterController>& rpPresenterController, const sal_Int32 nSizeChange); virtual ~NotesFontSizeCommand() {} - virtual void Execute() SAL_OVERRIDE; - virtual Any GetState() const SAL_OVERRIDE; + virtual void Execute() override; + virtual Any GetState() const override; protected: ::rtl::Reference<PresenterNotesView> GetNotesView() const; private: @@ -197,7 +197,7 @@ public: const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; static Command* CreateCommand ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); @@ -206,27 +206,27 @@ public: virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: OUString msURLPath; diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 45bd9f946c37..b68fcfcd73f3 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -49,7 +49,7 @@ public: explicit PresenterProtocolHandler (const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~PresenterProtocolHandler(); - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; static OUString getImplementationName_static(); static css::uno::Sequence< OUString > getSupportedServiceNames_static(); @@ -60,16 +60,16 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDispatchProvider @@ -78,12 +78,12 @@ public: const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::uno::Reference<css::frame::XDispatch> > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: class Dispatch; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 075764d29040..f4698b4e8f26 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -72,15 +72,15 @@ namespace { virtual ~PresenterScreenListener(); void Initialize(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // document::XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::frame::XModel2 > mxModel; diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index b523c22289c9..bb3f25692ddb 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -65,7 +65,7 @@ public: static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XJob @@ -73,7 +73,7 @@ public: const css::uno::Sequence<css::beans::NamedValue >& Arguments) throw (css::lang::IllegalArgumentException, css::uno::Exception, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; private: PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -104,7 +104,7 @@ public: const css::uno::Reference<css::frame::XModel2>& rxModel); virtual ~PresenterScreen(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; static bool isPresenterScreenEnabled( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -124,7 +124,7 @@ public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::frame::XModel2 > mxModel; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 4aaf2b960e75..cc73815f64d1 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -59,7 +59,7 @@ public: typedef ::std::function<void (double)> ThumbMotionListener; virtual ~PresenterScrollBar(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void SetVisible (const bool bIsVisible); @@ -115,47 +115,47 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None, __AreaCount__ = None }; @@ -253,20 +253,20 @@ public: const std::shared_ptr<PresenterPaintManager>& rpPaintManager, const ::std::function<void (double)>& rThumbMotionListener); virtual ~PresenterVerticalScrollBar(); - virtual sal_Int32 GetSize() const SAL_OVERRIDE; + virtual sal_Int32 GetSize() const override; protected: - virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const SAL_OVERRIDE; - virtual void UpdateDragAnchor (const double nDragDistance) SAL_OVERRIDE; - virtual double GetMinor (const double nX, const double nY) const SAL_OVERRIDE; - virtual void UpdateBorders() SAL_OVERRIDE; - virtual void UpdateBitmaps() SAL_OVERRIDE; + virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const override; + virtual void UpdateDragAnchor (const double nDragDistance) override; + virtual double GetMinor (const double nX, const double nY) const override; + virtual void UpdateBorders() override; + virtual void UpdateBitmaps() override; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, const SharedBitmapDescriptor& rpStartBitmaps, const SharedBitmapDescriptor& rpCenterBitmaps, - const SharedBitmapDescriptor& rpEndBitmaps) SAL_OVERRIDE; + const SharedBitmapDescriptor& rpEndBitmaps) override; private: sal_Int32 mnScrollBarWidth; diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 070dc779a001..a9d8fac19550 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -67,47 +67,47 @@ public: const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane, const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterSlidePreview(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; protected: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 1c4dfef7f0ff..5340bf65824c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -72,139 +72,139 @@ public: virtual ~PresenterSlideShowView(); void LateInit(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // CachablePresenterView - virtual void ReleaseView() SAL_OVERRIDE; + virtual void ReleaseView() override; // XSlideShowView virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clear() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XView virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // CachablePresenterView - virtual void ActivatePresenterView() SAL_OVERRIDE; + virtual void ActivatePresenterView() override; - virtual void DeactivatePresenterView() SAL_OVERRIDE; + virtual void DeactivatePresenterView() override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 9bc92bcb48ad..a610b7bc4b5d 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -72,7 +72,7 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterSlideSorter(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; static 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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener virtual void SAL_CALL propertyChange ( const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XSlidePreviewCacheListener virtual void SAL_CALL notifyPreviewCreation ( sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 3124bb3378da..a4b79bd88e02 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -53,7 +53,7 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterSpritePane(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; using PresenterPaneBase::disposing; @@ -62,29 +62,29 @@ public: // XPane virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::awt::XWindow> mxParentWindow; @@ -93,7 +93,7 @@ private: virtual void CreateCanvases ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) SAL_OVERRIDE; + const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) override; void UpdateCanvases(); }; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index cdc8882cd097..7fded7c12cf7 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() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated() SAL_OVERRIDE { mpLateDestroy.reset(); } + virtual void SAL_CALL run() override; + virtual void SAL_CALL onTerminated() override { mpLateDestroy.reset(); } }; } // end of anonymous namespace diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index c39626de89fa..45f0c5360a33 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -96,7 +96,7 @@ public: // XCallback virtual void SAL_CALL notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: static ::rtl::Reference<PresenterClockTimer> mpInstance; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 0b514b3e3850..328710e6b98c 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -135,7 +135,7 @@ namespace { explicit Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual ~Element(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() 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) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; protected: ::rtl::Reference<PresenterToolBar> mpToolBar; @@ -211,20 +211,20 @@ namespace { const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual ~Button(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, - const rendering::ViewState& rViewState) SAL_OVERRIDE; + const rendering::ViewState& rViewState) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; protected: virtual awt::Size CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) SAL_OVERRIDE; + const Reference<rendering::XCanvas>& rxCanvas) override; private: bool mbIsListenerRegistered; @@ -248,12 +248,12 @@ namespace { void SetText (const OUString& rsText); virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, - const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool SetState (const bool bIsOver, const bool bIsPressed) SAL_OVERRIDE; + const rendering::ViewState& rViewState) override; + virtual bool SetState (const bool bIsOver, const bool bIsPressed) override; protected: virtual awt::Size CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) SAL_OVERRIDE; + const Reference<rendering::XCanvas>& rxCanvas) override; }; // Some specialized controls. @@ -277,7 +277,7 @@ namespace { protected: explicit TimeLabel(const ::rtl::Reference<PresenterToolBar>& rpToolBar); using Element::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; private: class Listener : public PresenterClockTimer::Listener { @@ -285,7 +285,7 @@ namespace { explicit Listener (const ::rtl::Reference<TimeLabel>& rxLabel) : mxLabel(rxLabel) {} virtual ~Listener() {} - virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override { if (mxLabel.is()) mxLabel->TimeHasChanged(rCurrentTime); } private: ::rtl::Reference<TimeLabel> mxLabel; @@ -302,12 +302,12 @@ namespace { const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, - const SharedElementMode& rpDisabledMode) SAL_OVERRIDE; + const SharedElementMode& rpDisabledMode) override; private: TimeFormatter maTimeFormatter; CurrentTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual ~CurrentTimeLabel(); - virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override; }; class PresentationTimeLabel : public TimeLabel, public IPresentationTime @@ -319,14 +319,14 @@ namespace { const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, - const SharedElementMode& rpDisabledMode) SAL_OVERRIDE; - virtual void restart() SAL_OVERRIDE; + const SharedElementMode& rpDisabledMode) override; + virtual void restart() override; private: TimeFormatter maTimeFormatter; TimeValue maStartTimeValue; PresentationTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual ~PresentationTimeLabel(); - virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; + virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override; }; class VerticalSeparator : public Element @@ -335,12 +335,12 @@ namespace { explicit VerticalSeparator (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, - const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling() const SAL_OVERRIDE; + const rendering::ViewState& rViewState) override; + virtual bool IsFilling() const override; protected: virtual awt::Size CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) SAL_OVERRIDE; + const Reference<rendering::XCanvas>& rxCanvas) override; }; class HorizontalSeparator : public Element @@ -349,12 +349,12 @@ namespace { explicit HorizontalSeparator (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, - const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling() const SAL_OVERRIDE; + const rendering::ViewState& rViewState) override; + virtual bool IsFilling() const override; protected: virtual awt::Size CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) SAL_OVERRIDE; + const Reference<rendering::XCanvas>& rxCanvas) override; }; } // end of anonymous namespace diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 81bf00c39136..9418a79ebc37 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -92,7 +92,7 @@ public: void Initialize ( const OUString& rsConfigurationPath); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void InvalidateArea ( const css::awt::Rectangle& rRepaintBox, @@ -107,57 +107,57 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; class Context; @@ -232,37 +232,37 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterToolBarView(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ::rtl::Reference<PresenterToolBar> GetPresenterToolBar() const; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: // css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index d7677105ca54..87b0a9c5f6c4 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -76,7 +76,7 @@ public: virtual ~NextSlidePreview() {} virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { Reference<presentation::XSlideShowController> xSlideShowController ( mpPresenterController->GetSlideShowController()); diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 8483d23c5048..a084e9ac4a6d 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -99,19 +99,19 @@ public: virtual ~PresenterViewFactory(); virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) SAL_OVERRIDE; + throw (css::uno::RuntimeException) override; // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index d12dd77b563c..9d61c3c1ffad 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -73,7 +73,7 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterWindowManager(); - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; void SetParentPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme); @@ -117,49 +117,49 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; |