diff options
Diffstat (limited to 'svtools/source/toolpanel')
-rw-r--r-- | svtools/source/toolpanel/dummypanel.hxx | 18 | ||||
-rw-r--r-- | svtools/source/toolpanel/paneltabbar.cxx | 34 | ||||
-rw-r--r-- | svtools/source/toolpanel/paneltabbarpeer.hxx | 4 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpanelcollection.hxx | 16 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpaneldeck.cxx | 10 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpaneldeckpeer.hxx | 4 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpaneldrawer.hxx | 14 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpaneldrawerpeer.cxx | 4 | ||||
-rw-r--r-- | svtools/source/toolpanel/toolpaneldrawerpeer.hxx | 2 |
9 files changed, 53 insertions, 53 deletions
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index f87024a6fdaa..ff5e42c8f950 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -40,18 +40,18 @@ namespace svt ~DummyPanel(); // IToolPanel - virtual OUString GetDisplayName() const; - virtual Image GetImage() const; - virtual OString GetHelpID() const; - virtual void Activate( Window& i_rParentWindow ); - virtual void Deactivate(); - virtual void SetSizePixel( const Size& i_rPanelWindowSize ); - virtual void GrabFocus(); - virtual void Dispose(); + virtual OUString GetDisplayName() const SAL_OVERRIDE; + virtual Image GetImage() const SAL_OVERRIDE; + virtual OString GetHelpID() const SAL_OVERRIDE; + virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual void Dispose() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreatePanelAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); + ) SAL_OVERRIDE; DECLARE_IREFERENCE() }; diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 72be3e031cb2..a7d51f9b1c3d 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -112,10 +112,10 @@ namespace svt virtual ~VCLItemRenderer() {} // ITabBarRenderer - virtual void renderBackground() const; - virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const; - virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const; + virtual void renderBackground() const SAL_OVERRIDE; + virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -187,10 +187,10 @@ namespace svt virtual ~NWFToolboxItemRenderer() {} // ITabBarRenderer - virtual void renderBackground() const; - virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const; - virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const; + virtual void renderBackground() const SAL_OVERRIDE; + virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -264,10 +264,10 @@ namespace svt virtual ~NWFTabItemRenderer() {} // ITabBarRenderer - virtual void renderBackground() const; - virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const; - virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const; + virtual void renderBackground() const SAL_OVERRIDE; + virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -350,7 +350,7 @@ namespace svt } // IToolPanelDeckListener - virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) + virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE { (void)i_pPanel; (void)i_nPosition; @@ -360,7 +360,7 @@ namespace svt Relayout(); } - virtual void PanelRemoved( const size_t i_nPosition ) + virtual void PanelRemoved( const size_t i_nPosition ) SAL_OVERRIDE { m_bItemsDirty = true; m_rTabBar.Invalidate(); @@ -371,9 +371,9 @@ namespace svt Relayout(); } - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) SAL_OVERRIDE; + virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; + virtual void Dying() SAL_OVERRIDE; void UpdateScrollButtons() { diff --git a/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx index 9e2a60b6dea8..73b00eaac472 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.hxx +++ b/svtools/source/toolpanel/paneltabbarpeer.hxx @@ -42,10 +42,10 @@ namespace svt ~PanelTabBarPeer(); // VCLXWindow overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; // XComponent - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: AccessibleFactoryAccess m_aAccessibleFactory; diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx index 143ffc82b671..c88db479cf0b 100644 --- a/svtools/source/toolpanel/toolpanelcollection.hxx +++ b/svtools/source/toolpanel/toolpanelcollection.hxx @@ -41,15 +41,15 @@ namespace svt virtual ~ToolPanelCollection(); // IToolPanelDeck - virtual size_t GetPanelCount() const; - virtual PToolPanel GetPanel( const size_t i_nPos ) const; + virtual size_t GetPanelCount() const SAL_OVERRIDE; + virtual PToolPanel GetPanel( const size_t i_nPos ) const SAL_OVERRIDE; virtual ::boost::optional< size_t > - GetActivePanel() const; - virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ); - virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual PToolPanel RemovePanel( const size_t i_nPosition ); - virtual void AddListener( IToolPanelDeckListener& i_rListener ); - virtual void RemoveListener( IToolPanelDeckListener& i_rListener ); + GetActivePanel() const SAL_OVERRIDE; + virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) SAL_OVERRIDE; + virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; + virtual PToolPanel RemovePanel( const size_t i_nPosition ) SAL_OVERRIDE; + virtual void AddListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; + virtual void RemoveListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; private: ::std::auto_ptr< ToolPanelCollection_Data > m_pData; diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index a84e383e2801..6ec4bca72b7f 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -119,11 +119,11 @@ namespace svt protected: // IToolPanelDeckListener - virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; + virtual void PanelRemoved( const size_t i_nPosition ) SAL_OVERRIDE; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) SAL_OVERRIDE; + virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; + virtual void Dying() SAL_OVERRIDE; private: void ImplDoLayout(); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx index 099006f6c9c0..2ed84623939a 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx @@ -42,10 +42,10 @@ namespace svt ~ToolPanelDeckPeer(); // VCLXWindow overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; // XComponent - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: AccessibleFactoryAccess m_aAccessibleFactory; diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index 384a68564e2a..83ad9b336712 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -47,7 +47,7 @@ namespace svt protected: // Window overridables - virtual void Paint( const Rectangle& i_rBoundingBox ); + virtual void Paint( const Rectangle& i_rBoundingBox ) SAL_OVERRIDE; private: ToolPanelDrawer& m_rDrawer; @@ -71,14 +71,14 @@ namespace svt protected: // Window overridables - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& i_rEvent ); - virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& i_rEvent ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; private: Rectangle impl_calcTextBoundingBox() const; diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx index 30054f055553..1913c775b28e 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx @@ -62,8 +62,8 @@ namespace svt { } - virtual void ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent ); - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent ) SAL_OVERRIDE; + virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE; protected: ~ToolPanelDrawerContext() diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx index 51c2076337f7..46b1b5e75f68 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx @@ -39,7 +39,7 @@ namespace svt ~ToolPanelDrawerPeer(); // VCLXWindow overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; }; |