diff options
Diffstat (limited to 'sd/source/ui/inc')
140 files changed, 1043 insertions, 1043 deletions
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 7791eded64e4..bf5236e8b322 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -138,21 +138,21 @@ public: overload this method. */ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. @@ -161,7 +161,7 @@ public: ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ @@ -169,34 +169,34 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -205,84 +205,84 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XWindowListener ================================================= virtual void SAL_CALL windowResized (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XFocusListener ================================================= virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----------------------------xAttribute---------------------------- virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; ::sd::ViewShell* mpViewShell; private: // return the member maMutex; virtual ::osl::Mutex& - implGetMutex(); + implGetMutex() SAL_OVERRIDE; // return ourself as context in default case virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // return sal_False in default case virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // return nothing in default case virtual void implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: /// The core window that is made accessible. @@ -317,7 +317,7 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once @@ -327,7 +327,7 @@ protected: */ virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually @@ -338,7 +338,7 @@ protected: */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** This method is called when (after) the frame containing this document has been activated. Can be used to send FOCUSED state @@ -374,15 +374,15 @@ protected: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: virtual void SwitchViewActivated (void) { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void impl_dispose (void); }; diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index e7bd34c04f2e..44acc0b40c78 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -53,63 +53,63 @@ public: /** Complete the initialization begun in the constructor. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - 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::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getGroupPosition( const ::com::sun::star::uno::Any& rAny ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; protected: @@ -117,16 +117,16 @@ protected: virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -143,7 +143,7 @@ protected: */ virtual void implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::sd::ViewShell* mpSdViewSh; @@ -156,7 +156,7 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create a shape the represents the page as seen on the screen. */ @@ -165,31 +165,31 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Create an accessible description that contains the current view mode. */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. */ - virtual void Activated (void); + virtual void Activated (void) SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has lost the focus. */ - virtual void Deactivated (void); + virtual void Deactivated (void) SAL_OVERRIDE; - virtual void impl_dispose (void); + virtual void impl_dispose (void) SAL_OVERRIDE; //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetSelAccContextInTable(); diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index f10f217984bb..b4726387db9f 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -56,21 +56,21 @@ namespace accessibility virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual void UpdateData() SAL_OVERRIDE; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; // the view forwarder - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index fd9350645e19..dffa987c9967 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -54,39 +54,39 @@ public: /** Complete the initialization begun in the constructor. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - 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::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================== virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -94,19 +94,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -115,28 +115,28 @@ protected: virtual void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); // overridden to detect focus changes - virtual void Activated (void); + virtual void Activated (void) SAL_OVERRIDE; // overridden to detect focus changes - virtual void Deactivated (void); + virtual void Deactivated (void) SAL_OVERRIDE; // declared, but not defined AccessibleOutlineView( const AccessibleOutlineView& ); AccessibleOutlineView& operator= ( const AccessibleOutlineView& ); // This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create an accessible description that contains the current /// view mode. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 27fd6c4f98bc..96e41f3d5701 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -73,14 +73,14 @@ public: /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; /** Return the specified child. @param nIndex @@ -94,43 +94,43 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XComponent ====================================================== virtual void SAL_CALL dispose (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using AccessibleShape::disposing; @@ -140,16 +140,16 @@ protected: */ virtual OUString CreateAccessibleBaseName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString CreateAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 3f5f4111270d..3942796c3384 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -44,21 +44,21 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 64f63c76ab5f..829c1e1e3a51 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -44,21 +44,21 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 3acc032732ed..97a052febcd1 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -42,20 +42,20 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); - OUString GetStyle(); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + OUString GetStyle() SAL_OVERRIDE; private: /** Don't use the default constructor. Use the public constructor that diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 787e2675f558..6e719a6b358c 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -84,15 +84,15 @@ public: const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) 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 { WeakComponentImplHelperBase::dispose(); } - 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 addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(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 > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -100,7 +100,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -108,88 +108,88 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) - 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::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - 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::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - 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::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -199,19 +199,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e76855f03715..0ed08adf88bf 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -83,7 +83,7 @@ public: const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Return the implementation object of the specified child. @param nIndex @@ -93,11 +93,11 @@ public: //===== 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 { WeakComponentImplHelperBase::dispose(); } - 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 addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(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 > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -105,7 +105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -113,61 +113,61 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -175,7 +175,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ================================================ @@ -185,7 +185,7 @@ public: */ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty reference. */ @@ -193,45 +193,45 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty rectangle. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation does nothing. */ virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================== @@ -239,35 +239,35 @@ public: virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - 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::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -276,19 +276,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SwitchViewActivated (void); private: diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 45ee9d16767e..0f4b4d44a070 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -57,7 +57,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const; + virtual bool IsValid (void) const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -65,7 +65,7 @@ public: @return The rectangle of the visible part of the document. */ - virtual Rectangle GetVisibleArea() const; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; /** Transform the specified point from internal coordinates to an absolute screen position. @@ -77,7 +77,7 @@ public: The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ - virtual Point LogicToPixel (const Point& rPoint) const; + virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified size from internal coordinates to a screen * position. @@ -88,7 +88,7 @@ public: @return The same size but in screen coordinates. */ - virtual Size LogicToPixel (const Size& rSize) const; + virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; /** Transform the specified point from absolute screen coordinates to internal coordinates. @@ -100,7 +100,7 @@ public: @return The same point but in internal coordinates. */ - virtual Point PixelToLogic (const Point& rPoint) const; + virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified Size from screen coordinates to internal coordinates. @@ -111,7 +111,7 @@ public: @return The same size but in internal coordinates. */ - virtual Size PixelToLogic (const Size& rSize) const; + virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; protected: SdrPaintView* mpView; diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index f50b043e7534..ddb279acaf0e 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -53,7 +53,7 @@ public: sal_uLong nObjCount); virtual ~BreakDlg(); - short Execute(); + short Execute() SAL_OVERRIDE; private: FixedText* m_pFiObjInfo; diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 3aeceb3cedc7..41168e0e5ab6 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -38,10 +38,10 @@ class Client : public SfxInPlaceClient SdrGrafObj* pSdrGrafObj; OutlinerParaObject* pOutlinerParaObj; - virtual void ObjectAreaChanged(); - virtual void RequestNewObjectArea( Rectangle& ); - virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void ObjectAreaChanged() SAL_OVERRIDE; + virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; + virtual void ViewChanged() SAL_OVERRIDE; + virtual void MakeVisible() SAL_OVERRIDE; public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index ba45f858a06b..2599bdf904aa 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -39,12 +39,12 @@ public: DrawViewShell* pShell); virtual ~ClientView (void); - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ - virtual void InvalidateOneWin(::Window& rWin); - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 40c9b341d4ae..ac17d83da022 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -48,19 +48,19 @@ public: virtual sal_Int32 SAL_CALL getRendererCount ( const css::uno::Any& aSelection, const css::uno::Sequence<css::beans::PropertyValue >& xOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class Implementation; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index c62f8072bcff..721ce76b8c1c 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -167,81 +167,81 @@ public: DECLARE_XTYPEPROVIDER() // 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; // XController - virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - 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::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // view::XSelectionChangeListener virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL getConfigurationController (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL getModuleController (void) - 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>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** This method must return the name to index table. This table contains all property names and types of this object. */ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); @@ -252,7 +252,7 @@ protected: */ virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, - sal_Int32 nHandle ) const; + sal_Int32 nHandle ) const SAL_OVERRIDE; /** Convert the value rValue and return the result in rConvertedValue and the old value in rOldValue. @@ -273,7 +273,7 @@ protected: ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; /** The same as setFastProperyValue, but no exception is thrown and nHandle is always valid. You must not broadcast the changes in this method. @@ -281,7 +281,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; /** When the called object has been disposed already this method throws a Disposed exception and does not return. diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 1dee67d7a967..2396e3ffa477 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -71,34 +71,34 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( bool bMDI ); - virtual void Deactivate( bool bMDI ); - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual void Activate( bool bMDI ) SAL_OVERRIDE; + virtual void Deactivate( bool bMDI ) SAL_OVERRIDE; + virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; virtual bool ImportFrom(SfxMedium &rMedium, css::uno::Reference<css::text::XTextRange> const& xInsertPosition) SAL_OVERRIDE; - virtual bool ConvertFrom( SfxMedium &rMedium ); - virtual bool Save(); - virtual bool SaveAsOwnFormat( SfxMedium& rMedium ); - virtual bool ConvertTo( SfxMedium &rMedium ); - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - - virtual bool Load( SfxMedium &rMedium ); - virtual bool LoadFrom( SfxMedium& rMedium ); - virtual bool SaveAs( SfxMedium &rMedium ); - - virtual Rectangle GetVisArea(sal_uInt16 nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT); + virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool Save() SAL_OVERRIDE; + virtual bool SaveAsOwnFormat( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; + + virtual bool Load( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool SaveAs( SfxMedium &rMedium ) SAL_OVERRIDE; + + virtual Rectangle GetVisArea(sal_uInt16 nAspect) const SAL_OVERRIDE; + virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT) SAL_OVERRIDE; virtual ::svl::IUndoManager* - GetUndoManager(); - virtual Printer* GetDocumentPrinter(); - virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - virtual Size GetFirstPageSize(); - virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const; - virtual void SetModified( bool = true ); + GetUndoManager() SAL_OVERRIDE; + virtual Printer* GetDocumentPrinter() SAL_OVERRIDE; + virtual void OnDocumentPrinterChanged(Printer* pNewPrinter) SAL_OVERRIDE; + virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; + virtual Size GetFirstPageSize() SAL_OVERRIDE; + virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; + virtual void SetModified( bool = true ) SAL_OVERRIDE; virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, - const SfxItemSet &rSet ); + const SfxItemSet &rSet ) SAL_OVERRIDE; using SotObject::GetInterface; using SfxObjectShell::GetVisArea; @@ -192,7 +192,7 @@ public: @return Returns NULL when the current document has no reference device. */ - virtual OutputDevice* GetDocumentRefDev (void); + virtual OutputDevice* GetDocumentRefDev (void) SAL_OVERRIDE; DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); @@ -221,7 +221,7 @@ protected: bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); - virtual void InPlaceActivate( bool bActive ); + virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; public: virtual void setDocAccTitle( const OUString& rTitle ); virtual const OUString getDocAccTitle() const; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 5eb77118cfbd..b378d8c8247a 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { ::com::sun::star::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; }; } diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 5e566773afb1..2e873a29d2d2 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,12 +87,12 @@ public: virtual ~DrawViewShell (void); - virtual void Init (bool bIsMainViewShell); + virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; - virtual void Shutdown (void); + virtual void Shutdown (void) SAL_OVERRIDE; - void PrePaint(); - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + void PrePaint() SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Set the position and size of the area which contains the GUI elements like rulers, sliders, and buttons as well as the document @@ -119,17 +119,17 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; void HidePage(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); - virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SAL_OVERRIDE; - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); @@ -138,22 +138,22 @@ public: virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); - virtual void SetZoom( long nZoom ); - virtual void SetZoomRect( const Rectangle& rZoomRect ); + virtual void SetZoom( long nZoom ) SAL_OVERRIDE; + virtual void SetZoomRect( const Rectangle& rZoomRect ) SAL_OVERRIDE; void InsertURLField(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos); void InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos); - virtual void SetUIUnit(FieldUnit eUnit); + virtual void SetUIUnit(FieldUnit eUnit) SAL_OVERRIDE; void SelectionHasChanged(); void ModelHasChanged(); - virtual void Activate(bool bIsMDIActivate); - virtual void Deactivate(bool IsMDIActivate); - virtual void UIActivating( SfxInPlaceClient* ); - virtual void UIDeactivated( SfxInPlaceClient* ); + virtual void Activate(bool bIsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; + virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; @@ -236,10 +236,10 @@ public: void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } - virtual SdPage* GetActualPage() { return mpActualPage; } + virtual SdPage* GetActualPage() SAL_OVERRIDE { return mpActualPage; } /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ResetActualPage(); void ResetActualLayer(); @@ -254,11 +254,11 @@ public: void FreshNavigatrTree(); void MakeVisible(const Rectangle& rRect, ::Window& rWin); - virtual void ReadFrameViewData(FrameView* pView); - virtual void WriteFrameViewData(); + virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; - virtual ErrCode DoVerb(long nVerb); - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb) SAL_OVERRIDE; void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } sal_Bool IsZoomOnPage() { return mbZoomOnPage; } @@ -277,7 +277,7 @@ public: Do not call this method directly. Call the method at ViewShellBase instead. */ - virtual void ShowUIControls (bool bVisible = true); + virtual void ShowUIControls (bool bVisible = true) SAL_OVERRIDE; void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); @@ -286,14 +286,14 @@ public: sal_uInt16* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) SAL_OVERRIDE; - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; - virtual void VisAreaChanged(const Rectangle& rRect); + virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -304,7 +304,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; /** Return the number of layers managed by the layer tab control. This will usually differ from the number of layers managed by the layer @@ -357,14 +357,14 @@ public: /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const OUString& rLayerName, const OUString& rLayerTitle, const OUString& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; DrawView* GetDrawView() const { return mpDrawView; } /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; @@ -395,11 +395,11 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); - virtual SvxRuler* CreateVRuler(::sd::Window* pWin); - virtual void UpdateHRuler(); - virtual void UpdateVRuler(); - virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; + virtual void UpdateHRuler() SAL_OVERRIDE; + virtual void UpdateVRuler() SAL_OVERRIDE; + virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) SAL_OVERRIDE; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); @@ -450,14 +450,14 @@ private: SfxRequest& rRequest, PageKind ePageKind, SdPage* pPage, - const sal_Int32 nInsertPosition = -1); + const sal_Int32 nInsertPosition = -1) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; sal_Bool mbPastePossible; - virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; /** Stop a running slide show. The frame the show is running in is destroyed if diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 8bcc39b3b9fc..e0309275fd22 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -125,7 +125,7 @@ private: the factory working properly this method should not be necessary (and may be removed in the future.) */ - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 59663647da2c..f09d27473cb7 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -62,11 +62,11 @@ public: /** This method is overloaded in order to have the layer mode always active. */ - virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); + virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) SAL_OVERRIDE; protected: void ConstructGraphicViewShell (void); - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; private: DECL_LINK(TabBarSplitHandler, TabBar*); diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index 37d4ed0c58ec..4215754ae362 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -43,10 +43,10 @@ public: /** Callback function for general slot calls. */ - virtual void Execute (SfxRequest& rRequest); + virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 0da157499116..6f681c797b3a 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -43,10 +43,10 @@ public: /** Callback function for general slot calls. */ - virtual void Execute (SfxRequest& rRequest); + virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3a9331528a70..71b7092c8665 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -41,8 +41,8 @@ public: virtual ~LayerDialogContent (void); protected: - virtual bool Close (void); - virtual void Resize (void); + virtual bool Close (void) SAL_OVERRIDE; + virtual void Resize (void) SAL_OVERRIDE; private: LayerTabBar maLayerTabBar; diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index a9d24e94b6eb..83453a7d78e9 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -60,21 +60,21 @@ protected: DrawViewShell* pDrViewSh; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Select() SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming() SAL_OVERRIDE; + virtual long AllowRenaming() SAL_OVERRIDE; + virtual void EndRenaming() SAL_OVERRIDE; - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 9d145cc96889..a17aa67ab8a4 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -42,7 +42,7 @@ public: const SfxItemSet* GetOutputItemSet() const; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; private: using SfxTabDialog::GetOutputItemSet; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index ee71f9899226..2a9ed09f2d66 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -77,8 +77,8 @@ public: SdrTextObj* CreateTitleTextObject(SdPage* pPage); SdrTextObj* CreateOutlineTextObject(SdPage* pPage); - virtual void AddWindowToPaintView(OutputDevice* pWin); - virtual void DeleteWindowFromPaintView(OutputDevice* pWin); + virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; + virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; OutlinerView* GetViewByWindow (::Window* pWin) const; SdrOutliner* GetOutliner() { return(&mrOutliner) ; } @@ -115,14 +115,14 @@ public: sal_Bool PrepareClose(sal_Bool bUI = sal_True); - virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const SAL_OVERRIDE; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; void FillOutliner(); void SetLinks(); void ResetLinks() const; - SfxStyleSheet* GetStyleSheet() const; + SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; void SetSelectedPages(); @@ -131,17 +131,17 @@ public: DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; // Re-implement GetScriptType for this view to get correct results - virtual sal_uInt16 GetScriptType() const; + virtual sal_uInt16 GetScriptType() const SAL_OVERRIDE; /** After this method has been called with <TRUE/> following changes of the current page are ignored in that the corresponding text is not @@ -158,8 +158,8 @@ public: void UpdateParagraph( sal_Int32 nPara ); protected: - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; private: /** call this method before you do anything that can modify the outliner diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 5611360bf1ef..0897f2d6c908 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -59,32 +59,32 @@ public: virtual ~OutlineViewShell (void); - virtual void Shutdown (void); + virtual void Shutdown (void) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Arrange and resize the GUI elements like rulers, sliders, and buttons as well as the actual document view according to the size of the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; - virtual long VirtHScrollHdl(ScrollBar* pHScroll); - virtual long VirtVScrollHdl(ScrollBar* pVHScroll); + virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; + virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); - 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 SdPage* GetActualPage(); + virtual SdPage* GetActualPage() SAL_OVERRIDE; /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl(SfxRequest &rReq); void GetCtrlState(SfxItemSet &rSet); @@ -100,27 +100,27 @@ public: void FuPermanent(SfxRequest &rReq); void FuSupport(SfxRequest &rReq); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); + virtual void SetZoom(long nZoom) SAL_OVERRIDE; + virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void Execute(SfxRequest& rReq); - virtual void ReadFrameViewData(FrameView* pView); - virtual void WriteFrameViewData(); + virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); - virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); + virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) SAL_OVERRIDE; + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; sal_uLong Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; /** this method is called when the visible area of the view from this viewshell is changed */ - virtual void VisAreaChanged(const Rectangle& rRect); + virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -131,15 +131,15 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; OUString m_StrOldPageName; /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; /** Make the given page the new current page. This method notifies the controller and adapts the selection of the diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 1f72b48183ff..9e3da3723faf 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -145,10 +145,10 @@ public: SelectionIteratorImpl (const SelectionIteratorImpl& rObject); virtual ~SelectionIteratorImpl (void); - virtual void GotoNextText (void); - virtual const IteratorPosition& GetPosition (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; - virtual bool operator== (const IteratorImplBase& rIterator) const; + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual const IteratorPosition& GetPosition (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; + virtual bool operator== (const IteratorImplBase& rIterator) const SAL_OVERRIDE; private: const ::std::vector<SdrObjectWeakRef>& mrObjectList; @@ -163,7 +163,7 @@ private: @return Returns <TRUE/> when both iterators point to the same object. */ - virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; + virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const SAL_OVERRIDE; IteratorImplBase& operator= (const IteratorImplBase& rIterator); }; @@ -194,9 +194,9 @@ public: EditMode eEditMode); virtual ~ViewIteratorImpl (void); - virtual void GotoNextText (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; - virtual void Reverse (void); + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; + virtual void Reverse (void) SAL_OVERRIDE; protected: /// Number of pages in the view that is specified by <member>maPosition</member>. @@ -248,8 +248,8 @@ public: bool bDirectionIsForward); virtual ~DocumentIteratorImpl (void); - virtual void GotoNextText (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; private: sal_Int32 mnPageCount; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 9ca5ab2549bf..3e93c1bc2296 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -55,8 +55,8 @@ public: const OUString& rsTitle); virtual ~PaneDockingWindow (void); - virtual void StateChanged( StateChangedType nType ); - virtual void MouseButtonDown (const MouseEvent& rEvent); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; /** When docked the given range is passed to the parent SplitWindow. */ void SetValidSizeRange (const Range aValidSizeRange); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 887dbf30e5cb..035256539504 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -47,17 +47,17 @@ public: */ void FinishInitialization( FrameView* pFrameView ); - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); - virtual SvxRuler* CreateVRuler(::sd::Window* pWin); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; private: Rectangle maOldVisArea; - virtual void Activate (bool bIsMDIActivate); - virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); + virtual void Activate (bool bIsMDIActivate) SAL_OVERRIDE; + virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 0e74b4dade52..3a17c1388d99 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -42,7 +42,7 @@ public: virtual ~PresentationViewShellBase (void); protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 6eb60fe9bb6b..9120fd075612 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -125,7 +125,7 @@ public: int nWidth); protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; private: ::std::auto_ptr<VirtualDevice> mpPreviewDevice; diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index 3c450f0e4e87..8cf1ad428611 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -85,7 +85,7 @@ namespace sd ::std::vector<ClientInfoInternal*> mAvailableClients; - void execute(); + void execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index cd66d3cff8fb..f74000c3a4ab 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -56,11 +56,11 @@ protected: RulerCtrlItem* pCtrlItem; sal_Bool bHorz; - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); - virtual void ExtraDown(); + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void ExtraDown() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index b9138cd69416..bec7694294d8 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -52,19 +52,19 @@ public: const css::uno::Any& aSelection) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getSelection (void) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -72,10 +72,10 @@ public: virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -87,18 +87,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: sal_Bool getMasterPageMode(void) const throw(); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 75c4d44dd1f5..90ebdd777c24 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -40,7 +40,7 @@ public: OutlineViewShell& rViewShell) throw(); virtual ~SdUnoOutlineView (void) throw(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XSelectionSupplier @@ -48,28 +48,28 @@ public: virtual sal_Bool SAL_CALL select ( const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getSelection (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -81,13 +81,13 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL @@ -95,9 +95,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 9e5993322ac3..71acbbb6a66d 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -46,29 +46,29 @@ public: virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - 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::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -80,18 +80,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 630ced0a6659..66cdebe2108d 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -57,7 +57,7 @@ public: /** Late initialization that has to be called after a new instance has completed its construction. */ - virtual void Init (bool bIsMainViewShell); + virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; /** Return a slide sorter that is currently displayed in one of the panes that belong to the given ViewShellBase object. @@ -70,10 +70,10 @@ public: virtual void GetFocus (void); virtual void LoseFocus (void); - virtual SdPage* GetActualPage (void); + virtual SdPage* GetActualPage (void) SAL_OVERRIDE; /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl (SfxRequest& rRequest); virtual void GetCtrlState (SfxItemSet &rSet); @@ -83,12 +83,12 @@ public: virtual void FuPermanent (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); void ExecStatusBar (SfxRequest& rRequest); - virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow); + virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE; virtual void GetMenuState (SfxItemSet &rSet); virtual void GetClipboardState (SfxItemSet &rSet); - virtual void ReadFrameViewData (FrameView* pView); - virtual void WriteFrameViewData (void); + virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData (void) SAL_OVERRIDE; /** Set the zoom factor. The given value is clipped against an upper bound. @@ -96,22 +96,22 @@ public: An integer percent value, i.e. nZoom/100 is the actual zoom factor. */ - virtual void SetZoom (long int nZoom); - virtual void SetZoomRect (const Rectangle& rZoomRect); + virtual void SetZoom (long int nZoom) SAL_OVERRIDE; + virtual void SetZoomRect (const Rectangle& rZoomRect) SAL_OVERRIDE; /** This is a callback method used by the active window to delegate its Paint() call to. This view shell itself delegates it to the view. */ - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Place and size the controls and windows. You may want to call this method when something has changed that for instance affects the visibility state of the scroll bars. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; - virtual void Activate (bool IsMDIActivate); - virtual void Deactivate (bool IsMDIActivate); + virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; //===== Drag and Drop ===================================================== @@ -125,13 +125,13 @@ public: DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; typedef ::std::vector<SdPage*> PageSelection; @@ -158,7 +158,7 @@ public: */ void RemoveSelectionChangeListener (const Link& rListener); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -169,16 +169,16 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase - virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ); + virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) SAL_OVERRIDE; SlideSorter& GetSlideSorter (void) const; /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; protected: @@ -187,7 +187,7 @@ protected: /** This method is overloaded to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; + virtual ::svl::IUndoManager* ImpGetUndoManager (void) const SAL_OVERRIDE; private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; @@ -204,7 +204,7 @@ private: scroll bar and the base class call is thus unnecessary. It simply calls UpdateScrollBars(false). */ - virtual void UpdateScrollBars (void); + virtual void UpdateScrollBars (void) SAL_OVERRIDE; }; typedef ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection; diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 128a91638e06..50cf7e560920 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -54,14 +54,14 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ); + virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck); - virtual void GetFocus (void); - virtual void LoseFocus (void); + virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; + virtual void GetFocus (void) SAL_OVERRIDE; + virtual void LoseFocus (void) SAL_OVERRIDE; private: /** This outliner is used to do the main work of iterating over a diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 0948247fd569..50742964ce96 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -59,25 +59,25 @@ protected: sal_Bool bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Select() SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming() SAL_OVERRIDE; + virtual long AllowRenaming() SAL_OVERRIDE; + virtual void EndRenaming() SAL_OVERRIDE; - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual long DeactivatePage() SAL_OVERRIDE; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; DECL_LINK(DeactivatePageHdl, void*); @@ -94,9 +94,9 @@ private: virtual ~TabControlTransferable(); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 6c54607ef886..991d2efd7ff8 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -137,11 +137,11 @@ public: /** Implementation of the AsynchronousTask interface method. */ - virtual void RunNextStep (void); + virtual void RunNextStep (void) SAL_OVERRIDE; /** Implementation of the AsynchronousTask interface method. */ - virtual bool HasNextStep (void); + virtual bool HasNextStep (void) SAL_OVERRIDE; /** Return the TemplateDir object that was last added to mpTemplateDirectory. diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index ea916dcb0696..526298a0aec0 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -75,17 +75,17 @@ public: ViewShell* pViewSh=NULL); virtual ~View (void); - void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); - virtual void MarkListHasChanged(); - virtual void ModelHasChanged(); + virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); virtual void DoCut(::Window* pWindow=NULL); virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); - virtual void DoConnect(SdrOle2Obj* pOleObj); + virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -121,9 +121,9 @@ public: virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, - bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); + bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; - virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); + virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false) SAL_OVERRIDE; bool RestoreDefaultText( SdrTextObj* pTextObj ); @@ -167,29 +167,29 @@ public: std::vector<OUString> &rBookmarkList, const sal_uInt16 nType ); - virtual void onAccessibilityOptionsChanged(); + virtual void onAccessibilityOptionsChanged() SAL_OVERRIDE; - virtual SdrModel* GetMarkedObjModel() const; - virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE; using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ bool isRecordingUndo() const; - virtual void AddCustomHdl(); + virtual void AddCustomHdl() SAL_OVERRIDE; SmartTagSet& getSmartTags() { return maSmartTags; } void selectSmartTag( const SmartTagReference& xTag ); void updateHandles(); - virtual SdrViewContext GetContext() const; - virtual bool HasMarkablePoints() const; - virtual sal_uLong GetMarkablePointCount() const; - virtual bool HasMarkedPoints() const; - virtual sal_uLong GetMarkedPointCount() const; - virtual bool IsPointMarkable(const SdrHdl& rHdl) const; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); - virtual void CheckPossibilities(); + virtual SdrViewContext GetContext() const SAL_OVERRIDE; + virtual bool HasMarkablePoints() const SAL_OVERRIDE; + virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; + virtual bool HasMarkedPoints() const SAL_OVERRIDE; + virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; + virtual bool IsPointMarkable(const SdrHdl& rHdl) const SAL_OVERRIDE; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); using SdrMarkView::MarkPoints; @@ -236,8 +236,8 @@ protected: DECL_LINK( OnParagraphInsertedHdl, ::Outliner * ); DECL_LINK( OnParagraphRemovingHdl, ::Outliner * ); - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; SdDrawDocument& mrDoc; DrawDocShell* mpDocSh; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 16b823b537e1..02462db7ff7e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -541,8 +541,8 @@ protected: virtual void UpdateHRuler(); virtual void UpdateVRuler(); - 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 SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 995b8d9fad87..02aaa22897fe 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -112,35 +112,35 @@ public: virtual void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ - virtual OUString GetSelectionText(bool); - virtual bool HasSelection(bool) const; + virtual OUString GetSelectionText(bool) SAL_OVERRIDE; + virtual bool HasSelection(bool) const SAL_OVERRIDE; SvBorder GetBorder (bool bOuterResize); - virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize); - virtual void OuterResizePixel (const Point& rOrigin, const Size& rSize); + virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize) SAL_OVERRIDE; + virtual void OuterResizePixel (const Point& rOrigin, const Size& rSize) SAL_OVERRIDE; /** This call is forwarded to the main sub-shell. */ - virtual ErrCode DoVerb (long nVerb); + virtual ErrCode DoVerb (long nVerb) SAL_OVERRIDE; /** Return a new renderer that can be used for example for printing the document. */ - virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); + virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void) SAL_OVERRIDE; /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (bool bCreate = false); + virtual SfxPrinter* GetPrinter (bool bCreate = false) SAL_OVERRIDE; /// Forwarded to the print manager. virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false) SAL_OVERRIDE; /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - bool bBrowse = false); + bool bBrowse = false) SAL_OVERRIDE; /** Pass the given properties to the main view shell. After that we ensure that the right view shell type is displayed in the center @@ -149,20 +149,20 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - bool bBrowse = false); + bool bBrowse = false) SAL_OVERRIDE; - virtual void UIActivating( SfxInPlaceClient* ); - virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (bool IsMDIActivate); - virtual void Deactivate (bool IsMDIActivate); + virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; virtual void SetZoomFactor ( const Fraction &rZoomX, - const Fraction &rZoomY); + const Fraction &rZoomY) SAL_OVERRIDE; virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE; - virtual void WriteUserData (OUString&, bool bBrowse = false); - virtual void ReadUserData (const OUString&, bool bBrowse = false); - virtual SdrView* GetDrawView (void) const; - virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize); + virtual void WriteUserData (OUString&, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData (const OUString&, bool bBrowse = false) SAL_OVERRIDE; + virtual SdrView* GetDrawView (void) const SAL_OVERRIDE; + virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize) SAL_OVERRIDE; /** When <TRUE/> is given, then the mouse shape is set to hour glass (or whatever the busy shape looks like on the system.) @@ -228,7 +228,7 @@ public: protected: osl::Mutex maMutex; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual void InitializeFramework (void); diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 864f30377b60..8cb3266d67b9 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -68,7 +68,7 @@ public: ::com::sun::star::frame::XController>& rxController); virtual ~ViewTabBar (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; ::boost::shared_ptr< ::TabControl> GetTabControl (void) const; @@ -79,14 +79,14 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XTabBar ----------------------------------------------------------- @@ -95,42 +95,42 @@ public: SAL_CALL addTabBarButtonAfter ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL appendTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> SAL_CALL getTabBarButtons (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 7571f73dcf7a..56e0cb2a3429 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -137,11 +137,11 @@ public: double GetScrlPageWidth(); double GetScrlPageHeight(); virtual void GrabFocus(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; /** The DropScroll() method is used by AcceptDrop() to scroll the content of the window while dragging and dropping. With this method @@ -170,17 +170,17 @@ protected: ViewShell* mpViewShell; bool mbUseDropScroll; - virtual void Resize(); - virtual void PrePaint(); - virtual void Paint(const Rectangle& rRect); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); - virtual void RequestHelp( const HelpEvent& rEvt ); - virtual void LoseFocus(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; /** Create an accessibility object that makes this window accessible. @@ -190,11 +190,11 @@ protected: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void); + CreateAccessible (void) SAL_OVERRIDE; virtual void SwitchView(); - OUString GetSurroundingText() const; - Selection GetSurroundingTextSelection() const; + OUString GetSurroundingText() const SAL_OVERRIDE; + Selection GetSurroundingTextSelection() const SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 3aeb08f6fb05..fd775eee7ffd 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -102,7 +102,7 @@ public: /** Callback that waits for notifications of a <type>SvtCTLOptions</type> object. */ - virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint); + virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint) SAL_OVERRIDE; private: /// Options to monitor for changes. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index c740269478d3..9b9ecae46d3d 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -72,12 +72,12 @@ public: SdDisplay( ::Window* pWin, SdResId Id ); ~SdDisplay(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetBitmapEx( BitmapEx* pBmpEx ); void SetScale( const Fraction& rFrac ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -95,12 +95,12 @@ public: void AddObj( ::sd::View& rView ); void CreateAnimObj( ::sd::View& rView ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: - virtual bool Close(); - virtual void Resize(); - virtual void FillInfo( SfxChildWinInfo& ) const; + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void FillInfo( SfxChildWinInfo& ) const SAL_OVERRIDE; private: SdDisplay aCtlDisplay; @@ -178,7 +178,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: AnimationWindow* pAnimationWin; }; diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 1a7734785b57..e058a19ebdf8 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -38,7 +38,7 @@ class SdPagesField : public SvxMetricField private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; protected: - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; public: SdPagesField( Window* pParent, @@ -57,8 +57,8 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl { public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index cff67b0038a8..59ac70389b0c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -39,7 +39,7 @@ private: const SfxObjectShell& rDocShell; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index a68cec50466f..3578559f5216 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -47,7 +47,7 @@ public: SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); ~SdPageDlg() {}; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_DLGPAGE_HXX diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 7895129830c1..e02eb0f40644 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -48,7 +48,7 @@ protected: Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); @@ -56,7 +56,7 @@ protected: svtools::ColorConfig maColorConfig; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; void updateViewSettings(); @@ -64,15 +64,15 @@ public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void startPreview(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } const Link& GetClickHdl() const { return aClickHdl; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 18e5854527e7..0a149461b8a8 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,26 +42,26 @@ public: DrawViewShell* pShell); virtual ~DrawView (void); - virtual void MarkListHasChanged(); - void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + virtual void MarkListHasChanged() SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; void BlockPageOrderChangedHint(sal_Bool bBlock); - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); - virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False) SAL_OVERRIDE; + virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); - virtual void HideSdrPage(); // SdrPageView* pPV); + virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; + virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); void PresPaint(const Region& rRegion); - virtual void DeleteMarked(); // from SdrView + virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: - virtual void ModelHasChanged(); + virtual void ModelHasChanged() SAL_OVERRIDE; private: DrawDocShell* mpDocShell; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 04356d9c8c2d..bba6bbe6b592 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -84,7 +84,7 @@ public: bool bBroadcastRequestEvents); virtual ~Configuration (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfiguration @@ -92,12 +92,12 @@ public: virtual void SAL_CALL addResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResource( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( @@ -105,19 +105,19 @@ public: ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, ::com::sun::star::drawing::framework::AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -126,13 +126,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class ResourceContainer; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 62c4fb3d1e44..1175631f0dac 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -69,7 +69,7 @@ public: ConfigurationController (void) throw(); virtual ~ConfigurationController (void) throw(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void ProcessEvent (void); @@ -88,44 +88,44 @@ public: virtual void SAL_CALL lock() throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL unlock (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::ResourceActivationMode eMode) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL getResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getRequestedConfiguration (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getCurrentConfiguration (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL restoreConfiguration ( const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XConfigurationControllerBroadcaster @@ -135,27 +135,27 @@ public: css::drawing::framework::XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyEvent ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationRequestQueue virtual sal_Bool SAL_CALL hasPendingRequests (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest>& rxRequest) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceFactoryManager @@ -163,27 +163,27 @@ public: virtual void SAL_CALL addResourceFactory( const OUString& sResourceURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResourceFactoryForURL( const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResourceFactoryForReference( const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::framework::XResourceFactory> SAL_CALL getResourceFactory ( const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Use this class instead of calling lock() and unlock() directly in diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index e3f214811861..50c7cb720f92 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -74,20 +74,20 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XModuleController virtual void SAL_CALL requestResource(const OUString& rsResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference< diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 2b3460305612..c0b9221620b3 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -79,7 +79,7 @@ public: throw (); virtual ~Pane (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); @@ -96,46 +96,46 @@ public: */ virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XPane2 ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** For the typical pane it makes no sense to be dislayed without a view. Therefore this default implementation returns always <TRUE/>. */ virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 646a8e4ec1f6..38c07876fa30 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -63,7 +63,7 @@ public: const css::uno::Reference<css::frame::XController>& rxController); virtual ~PresentationFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XResourceFactory @@ -72,25 +72,25 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& xView) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index e308e2389f5a..30bccf4c8a59 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -107,57 +107,57 @@ public: virtual OUString SAL_CALL getResourceURL (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::URL SAL_CALL getFullResourceURL (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasAnchor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL getAnchor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getAnchorURLs (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getResourceTypePrefix (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL compareTo (const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isBoundTo ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::AnchorBindingMode eMode) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isBoundToURL ( const OUString& rsAnchorURL, css::drawing::framework::AnchorBindingMode eMode) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL clone (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInitialization =================================================== void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** The set of URLs that consist of the resource URL at index 0 and the diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 0ba3c93a98ca..dd8efc9c3087 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -74,8 +74,8 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); virtual ~ViewShellWrapper (void); - virtual void SAL_CALL disposing (void); - 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 disposing (void) SAL_OVERRIDE; + 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; static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); @@ -88,58 +88,58 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResource virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResource>& xResource) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::shared_ptr< ViewShell > mpViewShell; diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index ad0cd278c21c..910ba23218b8 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -31,8 +31,8 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; private: FuArea ( @@ -42,7 +42,7 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index 1dd91c70dd59..4e606a7f75c5 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; static void GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFrame* pViewFrame ); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index 20ffd3d9d202..c0f66b58193b 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -32,10 +32,10 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; private: FuChar ( diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index 9c0236e914ec..6ea52cbae3f6 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -36,18 +36,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; private: FuConstruct3dObject ( diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 8ac7bb453b9c..d9b2ece8b2b6 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -32,18 +32,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructArc ( diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0b65ff874bb6..15907e22a618 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -37,23 +37,23 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged(); + virtual void SelectionHasChanged() SAL_OVERRIDE; void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructBezierPolygon ( diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index c29cec57b251..66b34db89e77 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -35,22 +35,22 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; void SetAttributes( SdrObject* pObj ); - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; // #i33136# - virtual bool doConstructOrthogonal() const; + virtual bool doConstructOrthogonal() const SAL_OVERRIDE; protected: FuConstructCustomShape ( diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index 5eac44fd27c4..eb74f58e1023 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -32,7 +32,7 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuConnectionDlg ( diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 1d553336f7d2..3efba9d797f4 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -39,21 +39,21 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj); void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructRectangle ( diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 88794cbd21ca..322c58ddf4ca 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -34,18 +34,18 @@ class FuConstruct public: TYPEINFO_OVERRIDE(); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged() { bSelectionChanged = true; } + virtual void SelectionHasChanged() SAL_OVERRIDE { bSelectionChanged = true; } // SJ: setting stylesheet, the use of a filled or unfilled style // is determined by the member nSlotId : diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 49c0e56212d8..5914346e9720 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -35,18 +35,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructUnoControl( diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index 46388a11574b..5ac6bd5eafe7 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index 33b3b71b5da9..54685c4e32d5 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuCustomShowDlg ( diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 1a3e6af03a39..142976d39579 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -37,14 +37,14 @@ class FuDraw public: TYPEINFO_OVERRIDE(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void ForcePointer(const MouseEvent* pMEvt = NULL); @@ -61,7 +61,7 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; protected: FuDraw (ViewShell* pViewSh, diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index c194b9501a7b..8e1356a31c57 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -38,12 +38,12 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; protected: virtual ~FuDisplayOrder (void); diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 666804e49d64..5ea12d543057 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -31,22 +31,22 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual void ReceiveRequest(SfxRequest& rReq); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the postion and draw the new insert point - virtual void ForcePointer(const MouseEvent* pMEvt = NULL); + virtual void ForcePointer(const MouseEvent* pMEvt = NULL) SAL_OVERRIDE; private: sal_Bool bBeginInsertPoint; Point oldPoint; diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index 9eb997d8e791..df6415894d02 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -31,7 +31,7 @@ class FuExpandPage TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuExpandPage ( diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 99a3e47e4cbd..061224220e40 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -37,13 +37,13 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); @@ -51,7 +51,7 @@ public: private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - void DoExecute( SfxRequest& rReq ); + void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; void Paste( bool, bool ); diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index f002250b58dd..60276cd146a6 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: @@ -53,7 +53,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertClipboard ( @@ -74,7 +74,7 @@ class FuInsertOLE TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertOLE ( @@ -94,7 +94,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertAVMedia ( @@ -112,7 +112,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsert3DModel ( diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 4cb8a4bd8efa..fac9e41a4014 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; static void GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ); diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index 5ef287cf3a52..83bdc719237e 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -30,11 +30,11 @@ class FuLine public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index c70de5d33664..54207e7ccd1f 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -30,11 +30,11 @@ class FuLineEnd public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index ba787be323ce..ac127bf4bb2e 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index 19f3c95fb7c2..97c8909761a7 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -31,7 +31,7 @@ class FuMeasureDlg TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index ca18eb2363b5..c5a85d963a26 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -40,7 +40,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: typedef ::std::vector< ::basegfx::B2DPolyPolygon* > B2DPolyPolygonList_impl; diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 0f103156e50c..1d3b0290fa10 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 8a607cfcfe34..a5b559436af2 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -43,7 +43,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuOutlineBullet ( diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 5e5602128665..0b6b0fece74e 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -42,18 +42,18 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - - virtual void DoCut(); - virtual void DoCopy(); - virtual void DoPaste(); - virtual void DoPasteUnformatted(); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + + virtual void DoCut() SAL_OVERRIDE; + virtual void DoCopy() SAL_OVERRIDE; + virtual void DoPaste() SAL_OVERRIDE; + virtual void DoPasteUnformatted() SAL_OVERRIDE; + + virtual void Activate() SAL_OVERRIDE; // Function aktivieren + virtual void Deactivate() SAL_OVERRIDE; // Function deaktivieren /** Call this method when the text in the outliner (may) has changed. It will invalidate some slots of the view frame and update the diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 87c937402241..dbf764a3486c 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -43,7 +43,7 @@ class FuOutline public: TYPEINFO_OVERRIDE(); - virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; protected: FuOutline ( diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index 13753cfb0a39..ac2b947e7b6d 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -36,10 +36,10 @@ class FuPage TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; const SfxItemSet* ExecuteDialog( Window* pParent ); diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index 3341f249f47b..03e3b4b9f7cd 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -30,11 +30,11 @@ class FuParagraph public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuParagraph ( diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index ec080c35531c..2990385600ed 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -38,7 +38,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuPresentationLayout ( diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index f1b988169843..b8446fbc89d9 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -39,7 +39,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuPresentationObjects ( diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index c130589977fc..a3d1d46df7fa 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuScale ( diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 4540189c8ac1..2f80866f521d 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; void SearchAndReplace( const SvxSearchItem* pSearchItem ); diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index d9536102621c..6f5add203742 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -37,18 +37,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged(); + virtual void SelectionHasChanged() SAL_OVERRIDE; void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } @@ -61,10 +61,10 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; //let mouse cursor move - virtual void ForcePointer(const MouseEvent* pMEvt = NULL); + virtual void ForcePointer(const MouseEvent* pMEvt = NULL) SAL_OVERRIDE; protected: FuSelection (ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index 3ec8cb1fcac6..edb56ea8b58a 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSlideShowDlg ( diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index 3c1188f1f10c..2a001f5eac4f 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -30,11 +30,11 @@ class FuSnapLine public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSnapLine ( diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index 3f39ca9cd32c..1a21209c79ad 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSummaryPage ( diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index 630919dbf9e4..22ae4936b96e 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -30,11 +30,11 @@ class FuTemplate public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTemplate ( diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 3ec8412d4e3f..5c27032545e6 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -41,25 +41,25 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); - virtual void ReceiveRequest(SfxRequest& rReq); - virtual void DoubleClick(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; + virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; + virtual void DoubleClick(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); ///< activates the function - virtual void Deactivate(); ///< deactivates the function + virtual void Activate() SAL_OVERRIDE; ///< activates the function + virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag); sal_Bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -67,7 +67,7 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* ); @@ -78,7 +78,7 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); - virtual void disposing(); + virtual void disposing() SAL_OVERRIDE; SdrObjectWeakRef mxTextObj; Link aOldLink; diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index ea28787601d5..ed2b59aafe02 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuThesaurus ( diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 3118255ceda9..1f8dcd706b1a 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTransform ( diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index a6cf67566e0b..b56ebbc19d5a 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -31,7 +31,7 @@ class FuTextAttrDlg TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTextAttrDlg ( diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index 93ca46c9cf79..0bae57170a32 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 487c22a25fcf..9a8284b1cfe0 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -36,12 +36,12 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); ///< activates the function - virtual void Deactivate(); ///< deactivates the function + virtual void Activate() SAL_OVERRIDE; ///< activates the function + virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function protected: virtual ~FuZoom (void); diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 2c311dffea06..c9feba92a99f 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -35,7 +35,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~GlueEscDirLB(); - virtual void Select(); + virtual void Select() SAL_OVERRIDE; void Fill(); }; @@ -50,8 +50,8 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 807024960a5f..2887624ad2b0 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -74,7 +74,7 @@ public: void Apply(); void Cancel(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 01ba5dc542d8..4c68d66178a1 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -55,7 +55,7 @@ private: public: MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 582cf3cf1fe5..858654eb71be 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -98,7 +98,7 @@ public: const UpdateRequestFunctor& rUpdateRequest); virtual ~SdNavigatorWin(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void InitTreeLB( const SdDrawDocument* pDoc ); void RefreshDocumentLB( const OUString* pDocName = NULL ); @@ -109,8 +109,8 @@ public: void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } protected: - virtual void Resize(); - virtual bool Notify(NotifyEvent& rNEvt); + virtual void Resize() SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; private: @@ -153,7 +153,7 @@ private: DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( ShapeFilterCallback, Menu * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetDragImage(); void ApplyImageList(); public: @@ -177,7 +177,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: SdNavigatorWin* pNavigatorWin; @@ -197,7 +197,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: SdNavigatorWin* pNavigatorWin; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 01b22b53893b..e2a54d460ee5 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -62,8 +62,8 @@ public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< OUString >& rNames ); @@ -128,9 +128,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); @@ -162,8 +162,8 @@ public: SdOptionsLayoutItem( sal_uInt16 nWhich); SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -177,9 +177,9 @@ class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -195,8 +195,8 @@ public: SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -250,9 +250,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -341,8 +341,8 @@ public: SdOptionsMiscItem( sal_uInt16 nWhich); SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -369,9 +369,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -410,8 +410,8 @@ public: SdOptionsSnapItem( sal_uInt16 nWhich); SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -429,9 +429,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -448,9 +448,9 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -520,9 +520,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -583,8 +583,8 @@ public: SdOptionsPrintItem( sal_uInt16 nWhich); SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 12ea8065db10..4511537a9384 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -31,7 +31,7 @@ class SdParagraphDlg : public SfxTabDialog sal_uInt16 m_nParaStd; private: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e61e7c8a7bba..1cf08519b7c4 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -74,7 +74,7 @@ private: PresentationObjects ePO; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; // for mapping with the new SvxNumBulletItem SfxItemSet aInputSet; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index c0457e6cdad0..4966ad4c3b57 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -66,11 +66,11 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void SetDrawMode(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 31658b37c18f..eaa3680815ff 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -100,11 +100,11 @@ public: const ::com::sun::star::uno::Any maTreeListBoxData; SAL_DLLPRIVATE virtual ~SdPageObjsTransferable(); - SAL_DLLPRIVATE virtual void AddSupportedFormats(); - SAL_DLLPRIVATE virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); + SAL_DLLPRIVATE virtual void AddSupportedFormats() SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; friend class SdPageObjsTLB::SdPageObjsTransferable; @@ -139,13 +139,13 @@ protected: OUString maSelectionEntryText; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void RequestingChildren( SvTreeListEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; void DoDrag(); void OnDragFinished( sal_uInt8 nDropAction ); @@ -177,11 +177,11 @@ protected: SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos); + sal_uLong& rNewChildPos) SAL_OVERRIDE; using Window::GetDropTarget; - virtual SvTreeListEntry* GetDropTarget (const Point& rLocation); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&,SvLBoxButtonKind); + virtual SvTreeListEntry* GetDropTarget (const Point& rLocation) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&,SvLBoxButtonKind) SAL_OVERRIDE; public: @@ -191,10 +191,10 @@ public: // helper function for GetEntryAltText and GetEntryLongDescription OUString getAltLongDescText( SvTreeListEntry* pEntry , sal_Bool isAltText) const; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const; - virtual void SelectHdl(); - virtual void KeyInput( const KeyEvent& rKEvt ); + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + virtual void SelectHdl() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index d5d11926596d..efb4a2a63dee 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -34,10 +34,10 @@ public: aCtn() {} virtual ~SdUndoGroup(); - virtual bool Merge( SfxUndoAction* pNextAction ); + virtual bool Merge( SfxUndoAction* pNextAction ) SAL_OVERRIDE; - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; void AddAction(SdUndoAction* pAction); sal_uLong Count() const { return aCtn.size(); } diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 7aa90c662742..592af02b3ea0 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -77,9 +77,9 @@ public: static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; SdDrawDocument* GetSourceDoc (void) const; /** User data objects can be used to store information temporarily @@ -106,12 +106,12 @@ public: protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 5b8b0b7c6f9b..effb0ad93732 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -114,35 +114,35 @@ public: // uno api - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentation - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL end() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentation2 virtual void SAL_CALL startWithArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // legacy api diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index d7786dc1419a..a63b73fd0229 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -79,7 +79,7 @@ protected: virtual void deselect(); virtual bool getContext( SdrViewContext& rContext ); - virtual void disposing(); + virtual void disposing() SAL_OVERRIDE; ::sd::View& mrView; bool mbSelected; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 7fb2a53213c4..c08ee9e952ce 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -67,8 +67,8 @@ private: sal_uInt16 m_nTabId; sal_uInt16 m_nAsianTypoId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: SdTabTemplateDlg(Window* pParent, diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 71128fd8c645..182080a23b28 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -76,10 +76,10 @@ public: virtual void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void); - virtual SdPage* getCurrentPage (void) const; + virtual SdPage* GetActualPage (void) SAL_OVERRIDE; + virtual SdPage* getCurrentPage (void) const SAL_OVERRIDE; - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; TaskPaneShellManager& GetSubShellManager (void) const; @@ -102,13 +102,13 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; /** Relocate all toplevel controls to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index 20ec13892638..bfb3069360c6 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -35,10 +35,10 @@ public: SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxControl() {} - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_TBX_WW_HXX diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 1688af869617..def12f6c154e 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -27,13 +27,13 @@ public: SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); protected: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; private: OUString msTemplate; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 1076a72467a9..a8c87d158fd1 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -50,13 +50,13 @@ public: explicit PropertySet (void); virtual ~PropertySet (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const OUString& rsPropertyName, @@ -65,40 +65,40 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Return the requested property value. diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index a61b306d77eb..ccf7a3972571 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -97,20 +97,20 @@ public: virtual void SAL_CALL statusChanged ( const ::com::sun::star::frame::FeatureStateEvent& rState) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** This method is called by the WeakComponentImplHelper base class in reaction to a XComponent::dispose() call. It releases all currently active listeners. */ - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; private: Link maCallback; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 266c4c71da81..9503425de8d4 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -103,11 +103,11 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void Construct(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index be21955bb6fb..1be402ecaca2 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -40,8 +40,8 @@ public: ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; @@ -62,8 +62,8 @@ public: ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; /** @@ -127,16 +127,16 @@ private: void UpdateCompatibilityControls (void); protected: - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; /** Hide Impress specific controls, make Draw specific controls visible and arrange the visible controls. Do not call this method or the @@ -149,7 +149,7 @@ public: <member>SetDrawMode()</member> method more than once. */ void SetImpressMode (void); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 257eceaa2a73..e5096ea47358 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -41,10 +41,10 @@ public: const SfxItemSet* pTheNewItemSet); virtual ~StyleSheetUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNCHSS_HXX diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index e30bacb3ac01..0efaf156d148 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -47,10 +47,10 @@ public: const SfxItemSet& rItenSet); virtual ~SdBackgroundObjUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual SdUndoAction* Clone() const; + virtual SdUndoAction* Clone() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOBACK_HXX diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index b4b9cb5ecce7..944857741bff 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -40,8 +40,8 @@ public: SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ); virtual ~SdHeaderFooterUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOHEADERFOOTER_HXX diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index fda35cc5f3df..e19bfcd7ddf0 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -36,8 +36,8 @@ public: const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrLayer* mpLayer; diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 3a8faab7cbb3..1f24916d9c9e 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -101,8 +101,8 @@ public: {} virtual ~SdPageFormatUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; /************************************************************************/ @@ -130,8 +130,8 @@ public: {} virtual ~SdPageLRUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; /************************************************************************/ @@ -159,8 +159,8 @@ public: {} virtual ~SdPageULUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 7b0257353f95..bf9c0d6849d7 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -51,10 +51,10 @@ public: sal_Bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -66,10 +66,10 @@ public: const OUString& rOldLayoutName, const OUString& rNewLayoutName); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString maOldName; diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 3a976e5ef95e..65fca011ee5d 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -36,10 +36,10 @@ public: SdMoveStyleSheetsUndoAction(SdDrawDocument* pTheDoc, SdStyleSheetVector& rTheStyles, bool bInserted); virtual ~SdMoveStyleSheetsUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNMOVSS_HXX diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 05548711c4eb..b05158185c98 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -132,8 +132,8 @@ public: { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNOAPRMS_HXX diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index eccded2e0ad7..3e3f751346ac 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -139,83 +139,83 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) // 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; // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawPageDuplicator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMasterPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLayerManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCustomPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHandoutMasterSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence<css::uno::Any> const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -226,7 +226,7 @@ public: and still has to forward the second call to the base class. See also comments of issue 27847. */ - 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; }; /*********************************************************************** @@ -245,31 +245,31 @@ public: virtual ~SdDrawPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; }; /*********************************************************************** @@ -290,26 +290,26 @@ public: // XDrawPages virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; }; /*********************************************************************** @@ -327,23 +327,23 @@ public: virtual ~SdDocLinkTargets() throw(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // intern SdPage* FindPage( const OUString& rName ) const throw(); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 45c2f3ad8aad..ad7be67c5eae 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -55,14 +55,14 @@ public: virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSearchable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* ================================================================= */ @@ -97,21 +97,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* ================================================================= */ @@ -130,12 +130,12 @@ public: virtual ~SdUnoFindAllAccess() throw(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index b5a69d3a5383..58cb42f02380 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -47,10 +47,10 @@ public: SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNPRLOUT_HXX diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 5d3def0017f3..3c04ed81b489 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -46,7 +46,7 @@ public: bool CreateTags(); bool DisposeTags(); - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; private: ViewShellBase& mrBase; |