diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /accessibility/source | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'accessibility/source')
6 files changed, 46 insertions, 46 deletions
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index e7d884ea9c51..e9dd6774ef41 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -86,11 +86,11 @@ namespace accessibility protected: // IToolPanelDeckListener - virtual void PanelInserted( const ::svt::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 ::svt::PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; - virtual void Dying() SAL_OVERRIDE; + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) override; + virtual void PanelRemoved( const size_t i_nPosition ) override; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) override; + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) override; + virtual void Dying() override; public: AccessibleToolPanelDeck& m_rAntiImpl; diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 34b8362ebc4a..a41add67d371 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -76,7 +76,7 @@ namespace accessibility } // XAccessible - virtual Reference< XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Reference< XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (RuntimeException, std::exception) override { return m_xContext; } @@ -110,11 +110,11 @@ namespace accessibility protected: // IToolPanelDeckListener - virtual void PanelInserted( const ::svt::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 ::svt::PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; - virtual void Dying() SAL_OVERRIDE; + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) override; + virtual void PanelRemoved( const size_t i_nPosition ) override; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) override; + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) override; + virtual void Dying() override; DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 644b3fad2a32..dbd5cd05ff6d 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -78,11 +78,11 @@ namespace accessibility ::svt::PanelTabBar* getTabBar() const { return m_pTabBar; } // IToolPanelDeckListener - virtual void PanelInserted( const ::svt::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 ::svt::PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; - virtual void Dying() SAL_OVERRIDE; + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) override; + virtual void PanelRemoved( const size_t i_nPosition ) override; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) override; + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) override; + virtual void Dying() override; public: bool isDisposed() const { return m_pPanelDeck == NULL; } diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index f37d97222605..450096a26b4f 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -91,77 +91,77 @@ public: // ::toolkit::IAccessibleFactory virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXButton* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXButton* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXCheckBox* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXCheckBox* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXRadioButton* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXRadioButton* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXListBox* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXListBox* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXFixedText* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXFixedText* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXScrollBar* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXScrollBar* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXEdit* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXEdit* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXComboBox* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXComboBox* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXToolBox* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXToolBox* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > - createAccessibleContext( VCLXWindow* _pXWindow ) SAL_OVERRIDE; + createAccessibleContext( VCLXWindow* _pXWindow ) override; virtual css::uno::Reference< css::accessibility::XAccessible > - createAccessible( Menu* _pMenu, bool _bIsMenuBar ) SAL_OVERRIDE; + createAccessible( Menu* _pMenu, bool _bIsMenuBar ) override; // ::svt::IAccessibleFactory virtual IAccessibleTabListBox* createAccessibleTabListBox( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, SvHeaderTabListBox& rBox - ) const SAL_OVERRIDE; + ) const override; virtual IAccessibleBrowseBox* createAccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox - ) const SAL_OVERRIDE; + ) const override; virtual IAccessibleTableControl* createAccessibleTableControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTable& _rTable - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const css::uno::Reference< css::accessibility::XAccessible >& _xParent - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleTabBar( TabBar& _rTabBar - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleTextWindowContext( VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleTreeListBox( SvTreeListBox& _rListBox, const css::uno::Reference< css::accessibility::XAccessible >& _xParent - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderBar( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, AccessibleBrowseBoxObjType _eObjType - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxTableCell( @@ -171,7 +171,7 @@ public: sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderCell( @@ -180,7 +180,7 @@ public: IAccessibleTableProvider& _rBrowseBox, const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleCheckBoxCell( @@ -191,7 +191,7 @@ public: sal_uInt16 _nColPos, const TriState& _eState, bool _bIsTriState - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessible > createEditBrowseBoxTableCellAccess( @@ -201,19 +201,19 @@ public: IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleToolPanelDeck( const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck - ) SAL_OVERRIDE; + ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleToolPanelTabBar( const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar - ) SAL_OVERRIDE; + ) override; protected: virtual ~AccessibleFactory(); diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 0ec332d3f210..b2dfb1424cec 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -28,7 +28,7 @@ public: FloatingWindowAccessible( VCLXWindow* pWindow ); virtual ~FloatingWindowAccessible(); - virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) SAL_OVERRIDE; + virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; }; #endif // INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index f0f4db265e84..017a982b51ba 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -60,7 +60,7 @@ namespace ,m_nIndexInParent(_nIndexInParent) { } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -112,10 +112,10 @@ namespace // OAccessibleWrapper virtual OAccessibleContextWrapper* createAccessibleContext( const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxInnerContext - ) SAL_OVERRIDE; + ) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) override; static Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; |