summaryrefslogtreecommitdiff
path: root/include/vcl/menu.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 /include/vcl/menu.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/vcl/menu.hxx')
-rw-r--r--include/vcl/menu.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index b61c4a87b96e..6acc9b3a5925 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -440,16 +440,16 @@ public:
MenuBar& operator =( const MenuBar& rMenu );
- virtual bool IsMenuBar() const SAL_OVERRIDE { return true; }
+ virtual bool IsMenuBar() const override { return true; }
/// Close the 'pStartedFrom' menu window.
- virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE;
+ virtual void ClosePopup(Menu* pMenu) override;
/// Deactivate the MenuBarWindow.
- virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) SAL_OVERRIDE;
+ virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) override;
/// Forward the KeyInput call to the MenuBar.
- virtual void MenuBarKeyInput(const KeyEvent& rEvent) SAL_OVERRIDE;
+ virtual void MenuBarKeyInput(const KeyEvent& rEvent) override;
void ShowCloseButton( bool bShow = true );
bool HasCloseButton() const { return mbCloseBtnVisible; }
@@ -457,7 +457,7 @@ public:
bool HasHideButton() const { return mbHideBtnVisible; }
void ShowButtons( bool bClose, bool bFloat, bool bHide );
- virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE;
+ virtual void SelectItem(sal_uInt16 nId) override;
bool HandleMenuActivateEvent(Menu *pMenu) const;
bool HandleMenuDeActivateEvent(Menu *pMenu) const;
bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const;
@@ -524,10 +524,10 @@ public:
explicit PopupMenu( const ResId& );
virtual ~PopupMenu();
- virtual bool IsMenuBar() const SAL_OVERRIDE { return false; }
+ virtual bool IsMenuBar() const override { return false; }
/// Close the 'pStartedFrom' menu window.
- virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE;
+ virtual void ClosePopup(Menu* pMenu) override;
void SetText( const OUString& rTitle )
{
@@ -539,7 +539,7 @@ public:
// Fuer das TestTool
void EndExecute( sal_uInt16 nSelect = 0 );
- virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE;
+ virtual void SelectItem(sal_uInt16 nId) override;
void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only
static bool IsInExecute();