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/svx/fntctrl.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/fntctrl.hxx')
| -rw-r--r-- | include/svx/fntctrl.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 6e3d15ac4bd9..fc975cd29cbf 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -39,7 +39,7 @@ private: bool mbResetBackground : 1; SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground); - SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) override; SVX_DLLPRIVATE void Init (); SVX_DLLPRIVATE void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); @@ -48,10 +48,10 @@ public: SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId); SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Init( const SfxItemSet& rSet ); @@ -65,7 +65,7 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText( bool bUse = true ); - void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; bool IsTwoLines() const; void SetTwoLines(bool bSet); @@ -87,7 +87,7 @@ public: void SetFromItemSet( const SfxItemSet &rSet, bool bPreviewBackgroundToCharacter = false ); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; #endif // INCLUDED_SVX_FNTCTRL_HXX |