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 /include/sfx2/basedlgs.hxx | |
| parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
| download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/sfx2/basedlgs.hxx')
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 176e248f6894..610c5e672f25 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -81,7 +81,7 @@ protected: public: virtual ~SfxModalDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const SfxItemSet* GetOutputItemSet() const { return pOutputSet; } const SfxItemSet* GetInputItemSet() const { return pInputSet; } }; @@ -103,16 +103,16 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~SfxModelessDialog(); - virtual void dispose() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Move() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void dispose() override; + virtual bool Close() override; + virtual void Resize() override; + virtual void Move() override; + virtual void StateChanged( StateChangedType nStateChange ) override; public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; SfxBindings& GetBindings() { return *pBindings; } @@ -142,13 +142,13 @@ protected: const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~SfxFloatingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Move() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual bool Close() override; + virtual void Resize() override; + virtual void Move() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; SfxBindings& GetBindings() { return *pBindings; } @@ -184,7 +184,7 @@ public: const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); virtual ~SfxSingleTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } |