diff options
Diffstat (limited to 'include/sfx2/sidebar')
21 files changed, 133 insertions, 133 deletions
diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx index 6f786f00663a..80ca92607203 100644 --- a/include/sfx2/sidebar/Accessible.hxx +++ b/include/sfx2/sidebar/Accessible.hxx @@ -51,10 +51,10 @@ public: const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext); virtual ~Accessible(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XAccessible virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference<css::accessibility::XAccessibleContext> mxContext; diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/include/sfx2/sidebar/AccessibleTitleBar.hxx index 49e68e74265a..e81a9722b229 100644 --- a/include/sfx2/sidebar/AccessibleTitleBar.hxx +++ b/include/sfx2/sidebar/AccessibleTitleBar.hxx @@ -33,7 +33,7 @@ public: static css::uno::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar); protected: - virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE; + virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) override; private: explicit AccessibleTitleBar (VCLXWindow* pWindow); diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 97ea553bf24f..94e22e0c2d6b 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -79,7 +79,7 @@ public: ItemUpdateReceiverInterface& rItemUpdateReceiver); /// releases our action listener - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual ~ControllerItem(); @@ -125,7 +125,7 @@ public: protected: - virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; + virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; private: ItemUpdateReceiverInterface& mrItemUpdateReceiver; diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index 1d799ce73111..0057c721de00 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -42,7 +42,7 @@ public: vcl::Window* pParentWindow, const std::function<void()>& rCloserAction); virtual ~Deck(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const OUString& GetId() const { return msId; } @@ -62,10 +62,10 @@ public: */ void ShowPanel (const Panel& rPanel); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - virtual bool Notify(NotifyEvent& rEvent) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void DataChanged (const DataChangedEvent& rEvent) override; + virtual bool Notify(NotifyEvent& rEvent) override; static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); @@ -75,7 +75,7 @@ public: { public: ScrollContainerWindow(vcl::Window* pParentWindow); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; void SetSeparators(const ::std::vector<sal_Int32>& rSeparators); private: std::vector<sal_Int32> maSeparators; diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx index e42bbe7d29d3..700ad6a5eaea 100644 --- a/include/sfx2/sidebar/DeckTitleBar.hxx +++ b/include/sfx2/sidebar/DeckTitleBar.hxx @@ -32,14 +32,14 @@ public: void SetCloserVisible(const bool bIsCloserVisible); - virtual void DataChanged(const DataChangedEvent& rEvent) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; - virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual sidebar::Paint GetBackgroundPaint() override; + virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) override; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; private: const sal_uInt16 mnCloserItemIndex; diff --git a/include/sfx2/sidebar/MenuButton.hxx b/include/sfx2/sidebar/MenuButton.hxx index d725fb71c01d..67f47aa76575 100644 --- a/include/sfx2/sidebar/MenuButton.hxx +++ b/include/sfx2/sidebar/MenuButton.hxx @@ -29,10 +29,10 @@ class MenuButton public: MenuButton (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; - virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; - virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void MouseMove (const MouseEvent& rEvent) override; + virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; + virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; protected: using CheckBox::FillLayoutData; diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index a73edd598cb4..4d6490e8da11 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -44,7 +44,7 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~Panel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; PanelTitleBar* GetTitleBar() const; bool IsTitleBarOptional() const { return mbIsTitleBarOptional;} @@ -56,11 +56,11 @@ public: bool HasIdPredicate (const OUString& rsId) const; const OUString& GetId() const { return msPanelId;} - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - virtual void Activate() SAL_OVERRIDE; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Resize() override; + virtual void DataChanged (const DataChangedEvent& rEvent) override; + virtual void Activate() override; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; private: const OUString msPanelId; diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index b8dc3698f0b8..b8020bd0046e 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -33,22 +33,22 @@ class PanelTitleBar public: PanelTitleBar(const OUString& rsTitle, vcl::Window* pParentWindow, Panel* pPanel); virtual ~PanelTitleBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetMoreOptionsCommand(const OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame, const css::uno::Reference<css::frame::XController>& rxController); - virtual void DataChanged(const DataChangedEvent& rEvent) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMouseEvent) SAL_OVERRIDE; - virtual void MouseButtonUp(const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rEvent) override; + virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override; + virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; - virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual sidebar::Paint GetBackgroundPaint() override; + virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) override; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; private: bool mbIsLeftButtonDown; diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 64bc26ea431f..b90f037c7586 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -91,23 +91,23 @@ public: // ui::XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // beans::XPropertyChangeListener virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // ui::XSidebar virtual void SAL_CALL requestLayout() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; void NotifyResize(); @@ -265,7 +265,7 @@ private: */ void ShowPanel (const Panel& rPanel); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; std::unique_ptr<ResourceManager> mpResourceManager; diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx index defbb17315e2..382b48da7f78 100644 --- a/include/sfx2/sidebar/SidebarDockingWindow.hxx +++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx @@ -35,17 +35,17 @@ public: SidebarDockingWindow(SfxBindings* pBindings, SidebarChildWindow& rChildWindow, vcl::Window* pParent, WinBits nBits); virtual ~SidebarDockingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: // Window overridables - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; virtual SfxChildAlignment CheckAlignment ( SfxChildAlignment eCurrentAlignment, - SfxChildAlignment eRequestedAlignment) SAL_OVERRIDE; + SfxChildAlignment eRequestedAlignment) override; private: ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 55a409781459..d71d9662602a 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -66,38 +66,38 @@ public: // XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XUIElement virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getResourceURL() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XToolPanel virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible( const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XSidebarPanel virtual css::ui::LayoutSize SAL_CALL getHeightForWidth(sal_Int32 nWidth) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getMinimalWidth() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XUpdateModel virtual void SAL_CALL updateModel(const css::uno::Reference<css::frame::XModel>& xModel) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; protected: css::uno::Reference<css::frame::XFrame> mxFrame; @@ -107,7 +107,7 @@ protected: virtual ~SidebarPanelBase(); virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) SAL_OVERRIDE; + throw (css::uno::RuntimeException) override; private: VclPtr<vcl::Window> mpControl; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 574603b22e6d..1e8915a7ba67 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -41,18 +41,18 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox public: SidebarToolBox(vcl::Window* pParentWindow); virtual ~SidebarToolBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, ToolBoxItemBits nBits = ToolBoxItemBits::NONE, const Size& rRequestedSize = Size(), - sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE; + sal_uInt16 nPos = TOOLBOX_APPEND) override; - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; - virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; + virtual bool Notify (NotifyEvent& rEvent) override; css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const; sal_uInt16 GetItemIdForSubToolbarName (const OUString& rsCOmmandName) const; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 1620f5da3a35..9945eddd78f3 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -73,11 +73,11 @@ public: SidebarController* rParentSidebarController); virtual ~TabBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE; - virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override; + virtual bool Notify (NotifyEvent& rEvent) override; static sal_Int32 GetDefaultWidth(); diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx index c5eaabb858c1..9060729a9489 100644 --- a/include/sfx2/sidebar/TabItem.hxx +++ b/include/sfx2/sidebar/TabItem.hxx @@ -35,10 +35,10 @@ class TabItem public: TabItem (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; - virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; - virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void MouseMove (const MouseEvent& rEvent) override; + virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; + virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; private: bool mbIsLeftButtonDown; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index a92ac7a87188..95e875003c63 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -155,57 +155,57 @@ public: Theme(); virtual ~Theme(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; static css::uno::Reference<css::beans::XPropertySet> GetPropertySet(); // beans::XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue ( const ::rtl::OUString& rsPropertyName, const css::uno::Any& rValue) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue ( const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // beans::XPropertySetInfo virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: static Theme& GetCurrentTheme(); diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 0f918e43fdd1..1e1fae598929 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -33,17 +33,17 @@ public: vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint); virtual ~TitleBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTitle (const OUString& rsTitle); const OUString GetTitle() {return msTitle; } void SetIcon (const Image& rIcon); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void DataChanged (const DataChangedEvent& rEvent) override; + virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; ToolBox& GetToolBox() { @@ -63,7 +63,7 @@ protected: void PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& rFocusBox); virtual sidebar::Paint GetBackgroundPaint() = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; private: Image maIcon; diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx index 8bf416be94c4..74d4d75e665e 100644 --- a/include/sfx2/sidebar/UnoDeck.hxx +++ b/include/sfx2/sidebar/UnoDeck.hxx @@ -33,33 +33,33 @@ public: virtual ~SfxUnoDeck() {}; virtual OUString SAL_CALL getId() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitle() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitle( const OUString& newTitle ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isActive() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL activate( const sal_Bool bActivate ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::ui::XPanels> SAL_CALL getPanels() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getOrderIndex() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveFirst() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveLast() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveUp() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveDown() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx index 5e0089935dd6..b073033064c7 100644 --- a/include/sfx2/sidebar/UnoDecks.hxx +++ b/include/sfx2/sidebar/UnoDecks.hxx @@ -39,29 +39,29 @@ public: virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx index 0d396e99b829..227358e61ba3 100644 --- a/include/sfx2/sidebar/UnoPanel.hxx +++ b/include/sfx2/sidebar/UnoPanel.hxx @@ -36,35 +36,35 @@ public: virtual ~SfxUnoPanel() {}; virtual OUString SAL_CALL getId() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitle() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitle( const OUString& newTitle ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isExpanded() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL expand( const sal_Bool bCollapseOther ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapse( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getOrderIndex() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveFirst() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveLast() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveUp() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveDown() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getDialog() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx index 679163347e46..d23d3da14011 100644 --- a/include/sfx2/sidebar/UnoPanels.hxx +++ b/include/sfx2/sidebar/UnoPanels.hxx @@ -34,36 +34,36 @@ public: // XPanels virtual OUString SAL_CALL getDeckId() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; private: diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx index 687ecb2cfb94..79a3386d3628 100644 --- a/include/sfx2/sidebar/UnoSidebar.hxx +++ b/include/sfx2/sidebar/UnoSidebar.hxx @@ -42,23 +42,23 @@ public: SfxUnoSidebar(const css::uno::Reference<css::frame::XFrame>&); virtual void SAL_CALL showDecks (const sal_Bool bVisible) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setVisible (const sal_Bool bVisible) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isVisible() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference<css::ui::XDecks> SAL_CALL getDecks() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::ui::XSidebar> SAL_CALL getSidebar() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; }; |