diff options
Diffstat (limited to 'include/sfx2')
59 files changed, 502 insertions, 502 deletions
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index 18b86b821c63..e0cea2749346 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -94,37 +94,37 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XRepositorySupplier: virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XRepository > SAL_CALL getRDFRepository() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XDocumentMetadataAccess: virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > SAL_CALL getElementByMetadataReference( const ::com::sun::star::beans::StringPair & i_rReference) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > SAL_CALL getElementByURI(const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xURI) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > > SAL_CALL getMetadataGraphsWithType( const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xType) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL addMetadataFile(const OUString & i_rFileName, @@ -133,7 +133,7 @@ public: > & i_rTypes) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, std::exception); + ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL importMetadataFile(::sal_Int16 i_Format, @@ -150,23 +150,23 @@ public: ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::container::ElementExistException, ::com::sun::star::rdf::ParseException, - ::com::sun::star::io::IOException, std::exception); + ::com::sun::star::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMetadataFile( const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xGraphName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, std::exception); + ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addContentOrStylesFile( const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, std::exception); + ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeContentOrStylesFile( const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, std::exception); + ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromStorage( const ::com::sun::star::uno::Reference< @@ -177,25 +177,25 @@ public: ::com::sun::star::task::XInteractionHandler> & i_xHandler) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & i_xStorage) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & i_rMedium) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & i_rMedium) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; private: std::auto_ptr<DocumentMetadataAccess_Impl> m_pImpl; diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index 7b5aeb163007..e69fd3f536a6 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.hxx @@ -147,23 +147,23 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNamespace() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XMetadatable: virtual ::com::sun::star::beans::StringPair SAL_CALL getMetadataReference() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMetadataReference( const ::com::sun::star::beans::StringPair & i_rReference) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ensureMetadataReference() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// get the core object corresponding to this UNO object. diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 57cbf016b7e4..247ccface11c 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -101,9 +101,9 @@ class SfxLinkItem : public SfxPoolItem { Link aLink; public: - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const + virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxLinkItem( *this ); } - virtual bool operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return ((SfxLinkItem&)rL).aLink == aLink; } SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } @@ -194,7 +194,7 @@ public: // misc. bool GetOptions(SfxItemSet &); void SetOptions(const SfxItemSet &); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); bool IsDowning() const; void ResetLastDir(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index e486242670b1..4349a5be9b07 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -105,15 +105,15 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const OString& rID, const OUString& rUIXMLDescription ); ~SfxModelessDialog(); - virtual bool Close(); - virtual void Resize(); - virtual void Move(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxBindings& GetBindings() { return *pBindings; } @@ -143,11 +143,11 @@ protected: const ResId& rResId); ~SfxFloatingWindow(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual bool Close(); - virtual void Resize(); - virtual void Move(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxBindings& GetBindings() { return *pBindings; } diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 154e8b8f9dc8..03fa2c632b6b 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -282,7 +282,7 @@ public: static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ - virtual SfxChildWinInfo GetInfo() const + virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE #define SFX_DECL_CHILDWINDOW_WITHID(Class) \ SFX_DECL_CHILDWINDOW(Class); \ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index acf0d6c35b0f..52eda07573fe 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -201,7 +201,7 @@ public: /** Enables, disables, shows, or hides the control. @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; @@ -226,11 +226,11 @@ class SFX2_DLLPUBLIC DummyWindowWrapper: public: explicit DummyWindowWrapper( Window& rWindow ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; - virtual void* GetControlValue() const; - virtual void SetControlValue( void* ); + virtual void* GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( void* ) SAL_OVERRIDE; }; @@ -242,11 +242,11 @@ class SFX2_DLLPUBLIC CheckBoxWrapper: public: explicit CheckBoxWrapper( CheckBox& rCheckBox ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual bool GetControlValue() const; - virtual void SetControlValue( bool bValue ); + virtual bool GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( bool bValue ) SAL_OVERRIDE; }; @@ -263,11 +263,11 @@ public: virtual ~ColorListBoxWrapper(); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual Color GetControlValue() const; - virtual void SetControlValue( Color aColor ); + virtual Color GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( Color aColor ) SAL_OVERRIDE; }; @@ -444,12 +444,12 @@ public: void RegisterControlWrapper( ControlWrapperBase& rWrapper ); /** Enables, disables, shows, or hides the registered controls. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Returns true if all registered controls are in "don't know" state. */ - virtual bool IsControlDontKnow() const; + virtual bool IsControlDontKnow() const SAL_OVERRIDE; /** Sets all registered controls to "don't know" state. */ - virtual void SetControlDontKnow( bool bSet ); + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; private: std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 9925b5433e91..d3355e33f0e0 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -88,7 +88,7 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxStatusForwarder( sal_uInt16 nSlotId, diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 9389559d6776..a0f65b7825ff 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -170,10 +170,10 @@ public: GetCmisProperties() const; void SetCmisProperties(::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > cmisProps ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; // class SfxDocumentPage ------------------------------------------------- @@ -219,8 +219,8 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -242,8 +242,8 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -256,7 +256,7 @@ class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog private: sal_uInt16 m_nDocInfoId; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; public: SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); @@ -326,7 +326,7 @@ class CustomPropertiesDurationField : public Edit CustomPropertyLine* m_pLine; com::sun::star::util::Duration m_aDuration; protected: - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; public: CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); ~CustomPropertiesDurationField(); @@ -368,7 +368,7 @@ private: public: CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; inline void CheckYes() { m_aYesButton.Check(); } inline void CheckNo() { m_aNoButton.Check(); } @@ -489,7 +489,7 @@ public: GetCustomProperties() const { return m_pPropertiesWin->GetCustomProperties(); } void Init(VclBuilderContainer& rParent); - virtual void setAllocation(const Size &rAllocation); + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; // class SfxCustomPropertiesPage ----------------------------------------- @@ -506,9 +506,9 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -628,9 +628,9 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index 3560e0e2fc39..84c59666d31f 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.hxx @@ -32,7 +32,7 @@ public: InfoEdit_Impl( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) {} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 85d25fec608d..40dc08b3b59d 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -105,7 +105,7 @@ private: #define SFX_DECL_OBJECTFACTORY() \ public: \ static SfxObjectFactory& Factory(); \ - virtual SfxObjectFactory& GetFactory() const { return Factory(); } + virtual SfxObjectFactory& GetFactory() const SAL_OVERRIDE { return Factory(); } #define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \ SfxObjectFactory& ClassName::Factory() \ diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index f29988968b1f..919e30111ce9 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -57,16 +57,16 @@ protected: virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); - virtual void Resize(); - virtual bool PrepareToggleFloatingMode(); - virtual void ToggleFloatingMode(); - virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); - virtual void Resizing( Size& rSize ); - virtual void Paint( const Rectangle& rRect ); - virtual bool Close(); - virtual void Move(); + virtual void Resize() SAL_OVERRIDE; + virtual bool PrepareToggleFloatingMode() SAL_OVERRIDE; + virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void StartDocking() SAL_OVERRIDE; + virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE; + virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; } @@ -83,7 +83,7 @@ public: void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void SetDockingRects(const Rectangle& rOuter, const Rectangle& rInner) { aInnerRect = rInner; aOuterRect = rOuter; } @@ -98,7 +98,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void FadeIn( bool ); void AutoShow( bool bShow = true ); DECL_LINK(TimerHdl, void *); diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 21d13a60884d..53aa7e62f3d0 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -64,10 +64,10 @@ namespace sfx2 void dispose(); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~DocumentStorageModifyListener(); diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 3f96dedf95c8..15e230d69131 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -78,16 +78,16 @@ public: SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; const SfxEventNamesList& GetEvents() const { return aEventsList;} void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; } diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 67e04d36083e..8c3881ae2658 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -49,9 +49,9 @@ class SfxRefItem : public SfxPoolItem { SvRefBaseRef aRef; public: - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const + virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxRefItem( *this ); } - virtual bool operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return ((SfxRefItem&)rL).aRef == aRef; } SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) { aRef = rValue; } diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 0bf2a8763397..1641bd5f41cd 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -239,12 +239,12 @@ public: SfxFrameItem( SfxFrame *p=0 ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; bool FrameKilled() const { return &wFrame != pFrame; } @@ -260,10 +260,10 @@ public: SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny ); ::com::sun::star::uno::Any GetValue() const { return aValue; } - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem @@ -278,10 +278,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; typedef SfxUsrAnyItem SfxUnoAnyItem; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 7c17b1cad4b8..98b493bde8b5 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -237,15 +237,15 @@ public: virtual ~SfxFrameDescriptorItem(); - virtual bool operator ==( const SfxPoolItem& ) const; + virtual bool operator ==( const SfxPoolItem& ) const SAL_OVERRIDE; SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const SfxFrameProperties& GetProperties() const { return aProperties; } diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 9cd504d50b8f..091b98134e22 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -53,8 +53,8 @@ class SfxInfoBarWindow : public Window ~SfxInfoBarWindow( ); virtual const OUString& getId() const { return m_sId; } - virtual void Paint( const Rectangle& ); - virtual void Resize( ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Resize( ) SAL_OVERRIDE; private: DECL_LINK( CloseHandler, void* ); @@ -74,7 +74,7 @@ class SfxInfoBarContainerWindow : public Window SfxInfoBarWindow* getInfoBar( const OUString& sId ); void removeInfoBar( SfxInfoBarWindow* pInfoBar ); - virtual void Resize( ); + virtual void Resize( ) SAL_OVERRIDE; }; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 7dc7f5948345..f7e36c7f538b 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -261,11 +261,11 @@ public: protected: /** Actions according to current flags for the control. */ - virtual void ApplyFlags( const SfxItemSet& rItemSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; /** Resets the control according to the item contents. */ - virtual void Reset( const SfxItemSet& rItemSet ); + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; /** Fills the item set according to the control's state. */ - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; ItemWrapperType maItemWrp; ControlWrapperRef mxCtrlWrp; @@ -290,9 +290,9 @@ public: ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ); - virtual void Reset( const SfxItemSet& rItemSet ); - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: sal_uInt16 mnSlot; @@ -449,9 +449,9 @@ public: void AddConnection( ItemConnectionBase* pConnection ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ); - virtual void Reset( const SfxItemSet& rItemSet ); - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: std::auto_ptr< ItemConnectionArrayImpl > mxImpl; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 1b0fcfb3a517..9b0e1093eb58 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -79,13 +79,13 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual bool FillItemSet(SfxItemSet &); - virtual void Reset(const SfxItemSet &); + virtual bool FillItemSet(SfxItemSet &) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; using TabPage::ActivatePage; - virtual void ActivatePage(const SfxItemSet &); + virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage(SfxItemSet * = 0); + virtual int DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 3b443b570666..db322d412ccb 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -45,8 +45,8 @@ public: SfxMacroInfoItem( const SfxMacroInfoItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; OUString GetComment() const { return aCommentText; } void SetComment( const OUString& r ) diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 0ac440e245ca..97892478c0c8 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -64,7 +64,7 @@ public: virtual PopupMenu* GetPopup() const; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 48ab868b0f23..a6a57fcf342a 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -85,7 +85,7 @@ public: virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index dec3c734ac0a..9d40799f40e1 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -45,9 +45,9 @@ public: Window* pParent , WinBits nBits ); - virtual void Resize(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Resize() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 862e29fe4abd..86819aba688a 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SfxShell* GetShell() const { return _pSh; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 3374d0880ca6..c7b9ad9be1a8 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -190,7 +190,7 @@ protected: virtual ~SfxObjectShell(); virtual void ModifyChanged(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries */ @@ -225,7 +225,7 @@ public: GetCurrentComponent(); static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; SfxObjectShellFlags GetFlags( ) const ; @@ -493,7 +493,7 @@ public: // Documents, for which to format the view size - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); @@ -540,16 +540,16 @@ public: SvGlobalName GetClassName() const; // comphelper::IEmbeddedHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const; - virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const + virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const SAL_OVERRIDE; + virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const SAL_OVERRIDE { return const_cast<SfxObjectShell*>(this)->GetStorage(); } - virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const + virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const SAL_OVERRIDE { return GetEmbeddedObjectContainer(); } - bool isEnableSetModified() const + bool isEnableSetModified() const SAL_OVERRIDE { return IsEnableSetModified(); } @@ -733,7 +733,7 @@ class AutoReloadTimer_Impl : public Timer public: AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ); - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem @@ -756,11 +756,11 @@ public: pObjSh( pObjShell ) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SfxObjectShell* GetObjectShell() const { return pObjSh; } diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 0f558a0b50df..789e44442fd9 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -115,7 +115,7 @@ public: void ShowMinLengthText(bool bShow); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; #endif // INCLUDED_SFX2_PASSWD_HXX diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 27b5d93bb15e..03bb3a32f2db 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -89,17 +89,17 @@ private: protected: using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SfxCommonPrintOptionsTabPage(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual Window* GetParentLabeledBy( const Window* pLabel ) const; - virtual Window* GetParentLabelFor( const Window* pLabel ) const; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; + virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 95ea9ea3398c..0a6b635350cb 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -47,8 +47,8 @@ public: virtual ~SfxPrintOptionsDialog(); bool Construct(); - virtual short Execute(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual short Execute() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxTabPage* GetTabPage() const { return pPage; } const SfxItemSet& GetOptions() const { return *pOptions; } diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 9d0335d47e15..ca7dd23013c1 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -55,17 +55,17 @@ public: int mnFileTypes; - virtual void Clear(); + virtual void Clear() SAL_OVERRIDE; DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* ); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void OnItemDblClicked(ThumbnailViewItem *pItem); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; void OpenItem( const ThumbnailViewItem *pItem ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; bool isAcceptedFile(const OUString &rURL) const; diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index eb9a621769a5..e074296dca46 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -17,10 +17,10 @@ class RecentDocsViewItem : public ThumbnailViewItem public: RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL, const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId); - virtual void setEditTitle (bool edit, bool bChangeFocus = true); + virtual void setEditTitle (bool edit, bool bChangeFocus = true) SAL_OVERRIDE; /// Text to be used for the tooltip. - virtual OUString getHelpText() const; + virtual OUString getHelpText() const SAL_OVERRIDE; OUString maURL; diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 676aa971925c..96b2017516dc 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,8 +36,8 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index 561888e7d203..5de5c26e7b91 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -117,13 +117,13 @@ public: SAL_DLLPRIVATE void ReleaseShell_Impl(); SAL_DLLPRIVATE void BorderWidthsChanged_Impl(); - css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception); + css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController2 - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController @@ -142,7 +142,7 @@ public: @onerror - */ - virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -157,7 +157,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) ; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -172,7 +172,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) ; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -187,7 +187,7 @@ public: @onerror - */ - css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -202,7 +202,7 @@ public: @onerror - */ - void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) ; + void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -217,7 +217,7 @@ public: @onerror - */ - css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -232,7 +232,7 @@ public: @onerror - */ - css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XDispatchProvider @@ -253,7 +253,7 @@ public: virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) ; + FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -268,16 +268,16 @@ public: @onerror - */ - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XControllerBorder - virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception); + virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -296,7 +296,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -311,7 +311,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -326,27 +326,27 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) ; - virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchInformationProvider - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::frame::XTitle - virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::frame::XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 2b5b4493ee81..3094b9096239 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -229,7 +229,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short increment refcount @@ -245,7 +245,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() ; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short decrement refcount @@ -261,7 +261,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() ; + virtual void SAL_CALL release() throw() SAL_OVERRIDE ; // XTypeProvider @@ -280,7 +280,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short get implementation id @@ -296,7 +296,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; @@ -306,28 +306,28 @@ public: /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception); + throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const css::uno::Sequence< sal_Int8 >& Data ) - throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -347,7 +347,7 @@ public: @onerror - */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -363,7 +363,7 @@ public: */ virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -382,7 +382,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -397,7 +397,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -412,12 +412,12 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentPropertiesSupplier virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener @@ -436,7 +436,7 @@ public: @onerror - */ - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModel @@ -457,7 +457,7 @@ public: virtual sal_Bool SAL_CALL attachResource(const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -472,7 +472,7 @@ public: @onerror - */ - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -487,7 +487,7 @@ public: @onerror - */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -502,7 +502,7 @@ public: @onerror - */ - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -517,7 +517,7 @@ public: @onerror - */ - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -532,7 +532,7 @@ public: @onerror - */ - virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -547,7 +547,7 @@ public: @onerror - */ - virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -562,7 +562,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -577,7 +577,7 @@ public: @onerror - */ - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -593,7 +593,7 @@ public: */ virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -608,36 +608,36 @@ public: @onerror - */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModel2 virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, - css::uno::Exception, std::exception ); + css::uno::Exception, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString& ViewName , const css::uno::Sequence< css::beans::PropertyValue >& Arguments , const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, - css::uno::Exception, std::exception ); + css::uno::Exception, std::exception ) SAL_OVERRIDE; // XModifiable2 - virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -652,7 +652,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -668,7 +668,7 @@ public: */ virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception); + throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -683,7 +683,7 @@ public: @onerror - */ - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -698,27 +698,27 @@ public: @onerror - */ - virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XCloseable - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloseBroadcaster - virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPrintJobBroadcaster - virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPrintable @@ -737,7 +737,7 @@ public: @onerror - */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -753,7 +753,7 @@ public: */ virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @descr - @@ -768,14 +768,14 @@ public: */ virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStorable2 virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStorable @@ -794,7 +794,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -809,7 +809,7 @@ public: @onerror - */ - virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -824,7 +824,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -839,7 +839,7 @@ public: @onerror - */ - virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -856,7 +856,7 @@ public: virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) ; + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -873,7 +873,7 @@ public: virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception); + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -898,7 +898,7 @@ public: throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::RuntimeException, - css::uno::Exception, std::exception); + css::uno::Exception, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -917,17 +917,17 @@ public: throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::RuntimeException, - css::uno::Exception, std::exception); + css::uno::Exception, std::exception) SAL_OVERRIDE; // XDocumentSubStorageSupplier virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() - throw ( css::io::IOException, css::uno::RuntimeException, std::exception ); + throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStorageBasedDocument @@ -939,33 +939,33 @@ public: com::sun::star::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() throw ( css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XVisualObject @@ -975,33 +975,33 @@ public: throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XScriptProviderSupplier - virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUIConfigurationManagerSupplier - virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTransferable @@ -1023,7 +1023,7 @@ public: virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1040,7 +1040,7 @@ public: virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1056,7 +1056,7 @@ public: */ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -1076,22 +1076,22 @@ public: @onerror - */ - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEmbeddedScripts - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XScriptInvocationContext - virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventBroadcaster @@ -1110,7 +1110,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1125,115 +1125,115 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XModule virtual void SAL_CALL setIdentifier(const OUString& sIdentifier) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XModule virtual OUString SAL_CALL getIdentifier() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitle virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitle virtual void SAL_CALL setTitle( const OUString& sTitle ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitleChangeBroadcaster virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual OUString SAL_CALL getUntitledPrefix() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, - css::lang::WrappedTargetException, std::exception ); + css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, - css::lang::WrappedTargetException, std::exception ); + css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE; // css.document.XUndoManagerSupplier - virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XRepositorySupplier: virtual css::uno::Reference< css::rdf::XRepository > SAL_CALL getRDFRepository() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XDocumentMetadataAccess: virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL getElementByMetadataReference( const css::beans::StringPair & i_rReference) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI) throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, std::exception); + css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType( const css::uno::Reference< css::rdf::XURI > & i_xType) throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, std::exception); + css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XURI> SAL_CALL addMetadataFile(const OUString & i_rFileName, @@ -1242,7 +1242,7 @@ public: > & i_rTypes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::ElementExistException, std::exception); + css::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XURI> SAL_CALL importMetadataFile(::sal_Int16 i_Format, @@ -1259,23 +1259,23 @@ public: css::datatransfer::UnsupportedFlavorException, css::container::ElementExistException, css::rdf::ParseException, - css::io::IOException, std::exception); + css::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMetadataFile( const css::uno::Reference< css::rdf::XURI > & i_xGraphName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::NoSuchElementException, std::exception); + css::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addContentOrStylesFile( const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::ElementExistException, std::exception); + css::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeContentOrStylesFile( const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::NoSuchElementException, std::exception); + css::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromStorage( const css::uno::Reference< @@ -1286,53 +1286,53 @@ public: css::task::XInteractionHandler> & i_xHandler) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToStorage( const css::uno::Reference< css::embed::XStorage > & i_xStorage) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromMedium( const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToMedium( const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; // XCmisDocument virtual css::uno::Sequence< css::document::CmisProperty > SAL_CALL getCmisProperties() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setCmisProperties( const css::uno::Sequence< css::document::CmisProperty >& _cmisproperties ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL updateCmisProperties( const css::uno::Sequence< css::document::CmisProperty >& _cmisproperties ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::document::CmisVersion > SAL_CALL getAllVersions ( ) - throw (css::uno::RuntimeException, std::exception ); + throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); @@ -1354,7 +1354,7 @@ public: */ void Notify( SfxBroadcaster& aBC , - const SfxHint& aHint ) ; + const SfxHint& aHint ) SAL_OVERRIDE ; // public IMPL? @@ -1396,8 +1396,8 @@ public: void MethodEntryCheck( const bool i_mustBeInitialized ) const; ::osl::Mutex& getMutex() const { return m_aMutex; } - css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception); - void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception); + css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** calls all XEventListeners */ void notifyEvent( const css::document::EventObject& aEvent ) const; diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index de0b484660af..5bfa02892fbb 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -36,8 +36,8 @@ class SFX2_DLLPUBLIC SfxHelp : public Help private: SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); - SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ); - SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ) SAL_OVERRIDE; SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); @@ -48,7 +48,7 @@ public: inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual OUString GetHelpText( const OUString&, const Window* pWindow ); + virtual OUString GetHelpText( const OUString&, const Window* pWindow ) SAL_OVERRIDE; static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); static OUString GetDefaultHelpModule(); diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 44ad0b631edd..70301be57e04 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -59,15 +59,15 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2< virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: SfxStatusListener( const SfxStatusListener& ); diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index cfe8d8a30bda..1a028b2e7ec8 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -80,9 +80,9 @@ typedef sal_Int32 FrameSearchFlags; // static xxx::impl_createInstance() #define SFX_DECL_XSERVICEINFO_NOFACTORY \ /* XServiceInfo */ \ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ); \ - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ); \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ); \ + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ \ /* Helper for XServiceInfo */ \ static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \ diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 526e6385dd12..295fc6e611ab 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -313,7 +313,7 @@ inline void SfxShell::SetPool static SfxInterface* GetStaticInterface(); \ static SfxInterfaceId GetInterfaceId() {return SfxInterfaceId(nId);} \ static void RegisterInterface(SfxModule* pMod=NULL); \ - virtual SfxInterface* GetInterface() const; + virtual SfxInterface* GetInterface() const SAL_OVERRIDE; #define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId) \ \ diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 8a5fa68409bb..40ea6da108b2 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -125,7 +125,7 @@ public: protected: - virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState); + virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; private: ItemUpdateReceiverInterface& mrItemUpdateReceiver; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 54fd0537e0cb..eded1b333079 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -69,35 +69,35 @@ public: // XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent ( const css::ui::ContextChangeEventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XUIElement virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getResourceURL (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getType (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XToolPanel virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible ( const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XSidebarPanel virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getMinimalWidth () - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; protected: cssu::Reference<css::frame::XFrame> mxFrame; @@ -110,7 +110,7 @@ protected: virtual ~SidebarPanelBase (void); virtual void SAL_CALL disposing (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException) SAL_OVERRIDE; private: Window* mpControl; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index c0e86e07733f..aa712c6b4a01 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -48,11 +48,11 @@ public: const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame, ToolBoxItemBits nBits = 0, const Size& rRequestedSize = Size(), - sal_uInt16 nPos = TOOLBOX_APPEND); + sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE; - virtual void Paint (const Rectangle& rRect); + virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual bool Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; cssu::Reference<css::frame::XToolbarController> GetControllerForItemId ( const sal_uInt16 nItemId) const; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 466e20da0d56..b0dc72d03554 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -157,55 +157,55 @@ public: Theme (void); virtual ~Theme (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void); // beans::XPropertySet virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const ::rtl::OUString& rsPropertyName, const cssu::Any& rValue) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Any SAL_CALL getPropertyValue ( const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; // beans::XPropertySetInfo virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) throw(css::beans::UnknownPropertyException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; private: static Theme& GetCurrentTheme(); diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 06802341ad60..91c2a28024db 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -67,33 +67,33 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController protected: // new controller API // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, ::sal_Int32 nCommand, ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Old sfx2 interface virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index b53e8cdb6557..366703ea9bc9 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -33,7 +33,7 @@ private: DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); sal_uInt16 m_nOrganizerId; protected: - virtual const SfxItemSet* GetRefreshedSet(); + virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: SfxStyleDialog(Window* pParent, const OString& rID, @@ -44,7 +44,7 @@ public: SfxStyleSheetBase& GetStyleSheet() { return *pStyle; } const SfxStyleSheetBase& GetStyleSheet() const { return *pStyle; } - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 1b439ee30533..1e91f7dab83e 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -53,8 +53,8 @@ public: TYPEINFO_OVERRIDE(); SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; + virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog @@ -212,8 +212,8 @@ public: PushButton* GetUserButton() { return m_pUserBtn; } void RemoveResetButton(); - short Execute(); - void StartExecuteModal( const Link& rEndDialogHdl ); + short Execute() SAL_OVERRIDE; + void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; void Start( bool bShow = true ); const SfxItemSet* GetExampleSet() const { return pExampleSet; } diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 246e8cec145d..9f4e42c7ca9d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -69,7 +69,7 @@ namespace sfx2 SFX_DECL_CHILDWINDOW( TaskPaneWrapper ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; }; @@ -145,8 +145,8 @@ namespace sfx2 protected: // Window overridables - virtual void Resize(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; private: ::boost::scoped_ptr< ModuleTaskPane_Impl > m_pImpl; @@ -189,14 +189,14 @@ namespace sfx2 Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; protected: // Window overridables - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; // TitledDockingWindow overridables - virtual void onLayoutDone(); + virtual void onLayoutDone() SAL_OVERRIDE; private: ModuleTaskPane m_aTaskPane; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 49e5ca3ec9cc..5c40c48747a3 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -87,7 +87,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: SfxStatusListenerInterface* m_pCallee; @@ -118,8 +118,8 @@ private: void Delete(); protected: - virtual void PopupModeEnd(); - virtual bool Close(); + virtual void PopupModeEnd() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; virtual void DeleteFloatingWindow(); sal_uInt16 GetId() const { return m_nId; } @@ -132,7 +132,7 @@ protected: // SfxStatusListenerInterface using FloatingWindow::StateChanged; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxPopupWindow( sal_uInt16 nId, @@ -152,7 +152,7 @@ public: ~SfxPopupWindow(); virtual SfxPopupWindow* Clone() const; - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void StartCascading(); SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink ) @@ -209,48 +209,48 @@ protected: void SetPopupWindow( SfxPopupWindow* pWindow ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XEventListener using ::cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // new controller API // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController virtual void SAL_CALL execute( sal_Int16 KeyModifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL click() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL doubleClick() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rParent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSubToolbarController - virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDockableWindowListener - virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper methods void createAndPositionSubToolBar( const OUString& rSubToolBarResName ); @@ -300,9 +300,9 @@ class SfxDragButton_Impl : public FixedImage public: SfxDragButton_Impl( Window *pParent ); - virtual void Command ( const CommandEvent& rCEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; }; class SfxDragToolBoxControl_Impl : public SfxToolBoxControl @@ -310,9 +310,9 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; }; @@ -335,14 +335,14 @@ public: virtual ~SfxRecentFilesToolBoxControl(); protected: - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: using SfxToolBoxControl::Select; - virtual void Select( sal_uInt16 nSelectModifier ); + virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -364,10 +364,10 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl bool m_bShowMenuImages; protected: - virtual void Click(); + virtual void Click() SAL_OVERRIDE; using SfxToolBoxControl::Select; - virtual void Select( bool ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( bool ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK( Activate, Menu * ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 3be1cabe9783..646dd5e85183 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -128,9 +128,9 @@ protected: DECL_LINK(ShowRootRegionHdl, void*); - virtual void OnItemDblClicked(ThumbnailViewItem *pItem); + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; protected: diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx index e1236f5eb6ce..98623738cb8b 100644 --- a/include/sfx2/templatecontaineritem.hxx +++ b/include/sfx2/templatecontaineritem.hxx @@ -28,11 +28,11 @@ public: virtual ~TemplateContainerItem (); virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; bool HasMissingPreview( ); diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 8329e23d03eb..a6f4e336b62d 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -34,13 +34,13 @@ public: virtual ~TemplateLocalView (); // Fill view with template folders thumbnails - virtual void Populate (); + virtual void Populate () SAL_OVERRIDE; - virtual void reload (); + virtual void reload () SAL_OVERRIDE; - virtual void showRootRegion (); + virtual void showRootRegion () SAL_OVERRIDE; - virtual void showRegion (ThumbnailViewItem *pItem); + virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE; void showRegion (const OUString &rName); @@ -57,11 +57,11 @@ public: std::vector<TemplateItemProperties> getFilteredItems (const boost::function<bool (const TemplateItemProperties&) > &rFunc) const; - virtual sal_uInt16 createRegion (const OUString &rName); + virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE; - virtual bool isNestedRegionAllowed () const; + virtual bool isNestedRegionAllowed () const SAL_OVERRIDE; - virtual bool isImportAllowed () const; + virtual bool isImportAllowed () const SAL_OVERRIDE; bool removeRegion (const sal_uInt16 nItemId); @@ -91,7 +91,7 @@ public: bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const; - virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) SAL_OVERRIDE; private: diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index 7cf6fbb8acf4..0b6e9d897e77 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -25,17 +25,17 @@ public: virtual ~TemplateRemoteView (); - virtual void showRootRegion (); + virtual void showRootRegion () SAL_OVERRIDE; - virtual void showRegion (ThumbnailViewItem *pItem); + virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE; bool loadRepository (TemplateRepository* pRepository, bool bRefresh); - virtual sal_uInt16 createRegion (const OUString &rName); + virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE; - virtual bool isNestedRegionAllowed () const; + virtual bool isNestedRegionAllowed () const SAL_OVERRIDE; - virtual bool isImportAllowed () const; + virtual bool isImportAllowed () const SAL_OVERRIDE; private: diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 0d290e36ac7b..744eedcf8273 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -38,10 +38,10 @@ public: virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; sal_uInt16 mnRegionId; sal_uInt16 mnDocId; diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 96a03dfdc2f0..3633d86911bf 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -52,10 +52,10 @@ friend class SfxTemplateDialog_Impl; SfxTemplateDialog_Impl* pImpl; - virtual void DataChanged( const DataChangedEvent& _rDCEvt ); - virtual void Resize(); - virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* ); @@ -88,10 +88,10 @@ public: virtual ~SfxTemplatePanelControl(); virtual void Update(); - virtual void DataChanged( const DataChangedEvent& _rDCEvt ); - virtual void Resize(); + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void FreeResource (void); private: diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 7734bc9fc726..afe29c739e63 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -184,7 +184,7 @@ public: virtual ~ThumbnailView (); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void AppendItem (ThumbnailViewItem *pItem); @@ -239,7 +239,7 @@ public: void setItemStateHdl (const Link &aLink) { maItemStateHdl = aLink; } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); @@ -247,25 +247,25 @@ public: protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; protected: diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index cbac0878fc8b..c27948a1c2c9 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -94,14 +94,14 @@ namespace sfx2 protected: // Window overridables - virtual void Paint( const Rectangle& i_rArea ); - virtual void Resize(); - virtual void StateChanged( StateChangedType i_nType ); - virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ); - virtual void SetText( const OUString& i_rText ); + virtual void Paint( const Rectangle& i_rArea ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType i_nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) SAL_OVERRIDE; + virtual void SetText( const OUString& i_rText ) SAL_OVERRIDE; // DockingWindow overridables - void EndDocking( const Rectangle& rRect, bool bFloatMode ); + void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; // own overridables virtual void onLayoutDone(); diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 262f34824630..01ae81f19119 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -39,11 +39,11 @@ public: const OUString& GetStyleName() const { return aStyle; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual sal_uInt8 GetFlagCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual sal_uInt8 GetFlagCount() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 001a54460b5f..26b47b615621 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -60,10 +60,10 @@ public: { return aCommand; } // XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Something else - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void UnBind(); void GetNewDispatch(); void ReleaseDispatch(); @@ -90,10 +90,10 @@ public: // XDispatch virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Something else void ReleaseAll(); @@ -120,16 +120,16 @@ public: virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier(); static bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); @@ -170,7 +170,7 @@ public: static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; void setMasterSlaveCommand( bool bSet ); void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 43cac0dcf437..9c678f401ac8 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -79,7 +79,7 @@ private: #endif protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; #ifndef _SFX_HXX SAL_DLLPRIVATE void KillDispatcher_Impl(); @@ -135,8 +135,8 @@ public: void ToTop(); void Enable( bool bEnable ); virtual bool Close(); - virtual void Activate( bool bUI ); - virtual void Deactivate( bool bUI ); + virtual void Activate( bool bUI ) SAL_OVERRIDE; + virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface virtual long DdeExecute( const OUString& rCmd ); @@ -157,7 +157,7 @@ public: SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const; SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; @@ -303,9 +303,9 @@ public: pFrame( pViewFrame) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SfxViewFrame* GetFrame() const { return pFrame; } @@ -323,10 +323,10 @@ public: SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; } }; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 6fd665ab2907..e95377b46e5a 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -141,8 +141,8 @@ friend class SfxPrinterController; bool bNoNewWindow; protected: - virtual void Activate(bool IsMDIActivate); - virtual void Deactivate(bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); @@ -150,7 +150,7 @@ protected: virtual void Move(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: // Iteration @@ -225,7 +225,7 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); virtual void QueryObjAreaPixel( Rectangle& rRect ) const; - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; /** retrieves the document which shall be considered the "current document" when the frame is active The default implementation simply returns the XModel of the associated SfxObjectShell. You will rarely diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index da0d1343e516..e36780fd32b4 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -58,12 +58,12 @@ public: void SetType( SvxZoomType eNewType ) { eType = eNewType; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; |