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/tabdlg.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/tabdlg.hxx')
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 728cbf8d1591..f95fffeeedab 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -52,8 +52,8 @@ public: TYPEINFO_OVERRIDE(); SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const SAL_OVERRIDE; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const override; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog @@ -129,7 +129,7 @@ public: const OUString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); virtual ~SfxTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui CreateTabPage pCreateFunc, // != 0 @@ -194,8 +194,8 @@ public: void RemoveResetButton(); void RemoveStandardButton(); - short Execute() SAL_OVERRIDE; - void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; + short Execute() override; + void StartExecuteModal( const Link<>& rEndDialogHdl ) override; void Start( bool bShow = true ); const SfxItemSet* GetExampleSet() const { return pExampleSet; } @@ -233,7 +233,7 @@ protected: public: virtual ~SfxTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const SfxItemSet& GetItemSet() const { return *pSet; } |