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 /sd/source/ui/animations/CustomAnimationDialog.cxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sd/source/ui/animations/CustomAnimationDialog.cxx')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 278a8bc549a1..065da7f17dc3 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -102,9 +102,9 @@ public: PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl ); virtual ~PresetPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; - virtual Control* getControl() SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) override; + virtual Control* getControl() override; private: std::map< sal_uInt16, OUString > maPropertyValues; @@ -185,9 +185,9 @@ public: ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~ColorPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; - virtual Control* getControl() SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) override; + virtual Control* getControl() override; private: VclPtr<ColorListBox> mpControl; @@ -264,10 +264,10 @@ public: FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~FontPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; private: VclPtr<FontNameBox> mpControl; @@ -336,10 +336,10 @@ class DropdownMenuBox : public Edit public: DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); virtual ~DropdownMenuBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - void Resize() SAL_OVERRIDE; - bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + void Resize() override; + bool PreNotify( NotifyEvent& rNEvt ) override; void SetMenuSelectHdl( const Link<MenuButton *, void>& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); } @@ -418,10 +418,10 @@ public: CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~CharHeightPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); @@ -494,10 +494,10 @@ public: TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~TransparencyPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); DECL_LINK(implModifyHdl, void *); @@ -596,10 +596,10 @@ public: RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~RotationPropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); DECL_LINK(implModifyHdl, void *); @@ -719,10 +719,10 @@ public: ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~ScalePropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); DECL_LINK(implModifyHdl, void *); @@ -880,10 +880,10 @@ public: FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl ); virtual ~FontStylePropertyBox(); - virtual Any getValue() SAL_OVERRIDE; - virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; + virtual Any getValue() override; + virtual void setValue( const Any& rValue, const OUString& ) override; - virtual Control* getControl() SAL_OVERRIDE; + virtual Control* getControl() override; DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void ); @@ -998,7 +998,7 @@ class CustomAnimationEffectTabPage : public TabPage public: CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationEffectTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update( STLPropertySet* pSet ); DECL_LINK_TYPED( implSelectHdl, ListBox&, void ); @@ -1604,7 +1604,7 @@ class CustomAnimationDurationTabPage : public TabPage public: CustomAnimationDurationTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationDurationTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update( STLPropertySet* pSet ); @@ -1999,7 +1999,7 @@ class CustomAnimationTextAnimTabPage : public TabPage public: CustomAnimationTextAnimTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationTextAnimTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update( STLPropertySet* pSet ); |