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 /cui/source/inc/hltpbase.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cui/source/inc/hltpbase.hxx')
-rw-r--r-- | cui/source/inc/hltpbase.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 15e840082944..c11d8afde363 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -50,13 +50,13 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper { protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Select() override; + virtual void Modify() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::File ); @@ -115,7 +115,7 @@ public: const SfxItemSet& rItemSet ); virtual ~SvxHyperlinkTabPageBase (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetDocumentFrame( const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame ) @@ -127,18 +127,18 @@ public: virtual void DoApply (); virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) override; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void ActivatePage( const SfxItemSet& rItemSet ) override; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) override; bool IsMarkWndVisible () { return static_cast<vcl::Window*>(mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); - virtual void ActivatePage() SAL_OVERRIDE; - virtual void DeactivatePage() SAL_OVERRIDE; - virtual bool QueryClose() SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual void DeactivatePage() override; + virtual bool QueryClose() override; protected: virtual bool ShouldOpenMarkWnd(); |