summaryrefslogtreecommitdiff
path: root/starmath/inc/ElementsDockingWindow.hxx
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 /starmath/inc/ElementsDockingWindow.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'starmath/inc/ElementsDockingWindow.hxx')
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index a06e17338cd8..41ec150cadd6 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -63,7 +63,7 @@ class SmElementSeparator : public SmElement
public:
SmElementSeparator();
- virtual bool isSeparator() SAL_OVERRIDE
+ virtual bool isSeparator() override
{
return true;
}
@@ -81,9 +81,9 @@ class SmElementsControl : public Control
static const sal_uInt16 aFormats[][2];
static const sal_uInt16 aOthers[][2];
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
- virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+ virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
typedef std::shared_ptr<SmElement> SmElementPointer;
typedef std::vector< SmElementPointer > SmElementList;
@@ -113,13 +113,13 @@ class SmElementsControl : public Control
public:
SmElementsControl(vcl::Window *pParent);
virtual ~SmElementsControl();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void setElementSetId(sal_uInt16 aSetId);
void setVerticalMode(bool bVertical);
- Size GetOptimalSize() const SAL_OVERRIDE;
+ Size GetOptimalSize() const override;
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
void DoScroll(long nDelta);
@@ -134,7 +134,7 @@ class SmElementsDockingWindow : public SfxDockingWindow
VclPtr<SmElementsControl> mpElementsControl;
VclPtr<ListBox> mpElementListBox;
- virtual void Resize() SAL_OVERRIDE;
+ virtual void Resize() override;
SmViewShell* GetView();
void SelectClickHandler(SmElement* pElement);
@@ -146,10 +146,10 @@ public:
SfxChildWindow* pChildWindow,
vcl::Window* pParent );
virtual ~SmElementsDockingWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
- virtual void ToggleFloatingMode() SAL_OVERRIDE;
+ virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) override;
+ virtual void ToggleFloatingMode() override;
};
class SmElementsDockingWindowWrapper : public SfxChildWindow