summaryrefslogtreecommitdiff
path: root/include/svx/sidebar
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /include/svx/sidebar
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/sidebar')
-rw-r--r--include/svx/sidebar/AreaPropertyPanelBase.hxx6
-rw-r--r--include/svx/sidebar/LinePropertyPanelBase.hxx4
-rw-r--r--include/svx/sidebar/PanelLayout.hxx8
-rw-r--r--include/svx/sidebar/PopupContainer.hxx2
-rw-r--r--include/svx/sidebar/PopupControl.hxx2
-rw-r--r--include/svx/sidebar/SelectionChangeHandler.hxx6
-rw-r--r--include/svx/sidebar/SidebarDialControl.hxx6
-rw-r--r--include/svx/sidebar/ValueSetWithTextControl.hxx2
8 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 893284222fd4..169972679d3b 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -62,16 +62,16 @@ class SVX_DLLPUBLIC AreaPropertyPanelBase
{
public:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
virtual void DataChanged(
- const DataChangedEvent& rEvent) SAL_OVERRIDE;
+ const DataChangedEvent& rEvent) override;
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
const SfxPoolItem* pState,
- const bool bIsEnabled) SAL_OVERRIDE;
+ const bool bIsEnabled) override;
const static sal_Int32 DEFAULT_CENTERX;
const static sal_Int32 DEFAULT_CENTERY;
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 18c108caca0c..02c86f6ef232 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -72,10 +72,10 @@ class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout
{
public:
virtual ~LinePropertyPanelBase();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
virtual void DataChanged(
- const DataChangedEvent& rEvent) SAL_OVERRIDE;
+ const DataChangedEvent& rEvent) override;
void SetWidth(long nWidth);
void SetWidthIcon(int n);
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 09386a697cb8..70c96db21b06 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -35,11 +35,11 @@ public:
PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame);
virtual ~PanelLayout();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE;
- virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
+ virtual Size GetOptimalSize() const override;
+ virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override;
+ virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
};
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index f15c283ff313..851c38fa62fd 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -36,7 +36,7 @@ public:
PopupContainer (vcl::Window* pParent);
virtual ~PopupContainer();
- virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE;
+ virtual bool Notify (NotifyEvent& rNEvt) override;
};
diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
index b518590a0f32..8f87c9a9f99a 100644
--- a/include/svx/sidebar/PopupControl.hxx
+++ b/include/svx/sidebar/PopupControl.hxx
@@ -39,7 +39,7 @@ public:
vcl::Window* pParent,
const ResId& rResId);
- virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rect) SAL_OVERRIDE;
+ virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rect) override;
};
} } // end of namespace svx::sidebar
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index 00ecc3831690..841ab32b546f 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -54,13 +54,13 @@ public:
virtual ~SelectionChangeHandler();
virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
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;
virtual void SAL_CALL disposing()
- throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException) override;
void Connect();
void Disconnect();
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index 52d798e2ab89..1dea181b942a 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -30,11 +30,11 @@ class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl
public:
SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0);
- virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual void MouseButtonDown (const MouseEvent& rMEvt) SAL_OVERRIDE;
+ virtual Size GetOptimalSize() const override;
+ virtual void MouseButtonDown (const MouseEvent& rMEvt) override;
protected:
- virtual void HandleMouseEvent (const Point& rPos, bool bInitial) SAL_OVERRIDE;
+ virtual void HandleMouseEvent (const Point& rPos, bool bInitial) override;
};
} } // end of namespace svx::sidebar
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index e0c941d19645..69ac4f888860 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -79,7 +79,7 @@ public:
const OUString& rItemText2,
const OUString* pItemHelpText );
- virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
+ virtual void UserDraw( const UserDrawEvent& rUDEvt ) override;
private:
struct ValueSetWithTextItem