summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/autocdlg.cxx4
-rw-r--r--cui/source/tabpages/backgrnd.cxx8
-rw-r--r--cui/source/tabpages/borderconn.cxx20
-rw-r--r--cui/source/tabpages/tabstpge.cxx4
4 files changed, 18 insertions, 18 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 096ef6d31bcd..545988b6a51e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -311,7 +311,7 @@ public:
get(m_pPrcntMF, "margin");
}
virtual ~OfaAutoFmtPrcntSet() { disposeOnce(); }
- virtual void dispose() SAL_OVERRIDE { m_pPrcntMF.clear(); ModalDialog::dispose(); }
+ virtual void dispose() override { m_pPrcntMF.clear(); ModalDialog::dispose(); }
MetricField& GetPrcntFld()
{
@@ -333,7 +333,7 @@ public:
const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr){}
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
- const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE;
+ const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
};
void OfaImpBrwString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext,
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 19da4fa2e2f3..7f009a562b9e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -151,15 +151,15 @@ public:
explicit BackgroundPreviewImpl(vcl::Window* pParent);
void setBmp(bool bBmp);
virtual ~BackgroundPreviewImpl();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void NotifyChange( const Color& rColor );
void NotifyChange( const Bitmap* pBitmap );
protected:
- virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
+ virtual void Resize() override;
private:
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 6dc3b8e7ffee..7b4020fb4dea 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -44,9 +44,9 @@ public:
virtual ~LineItemWrapper() {}
- virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const SAL_OVERRIDE
+ virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const override
{ return rItem.GetLine(); }
- virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const SAL_OVERRIDE
+ virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const override
{ rItem.SetLine( pLine ); }
};
@@ -58,11 +58,11 @@ public:
inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) :
SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {}
- virtual bool IsControlDontKnow() const SAL_OVERRIDE;
- virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
+ virtual bool IsControlDontKnow() const override;
+ virtual void SetControlDontKnow( bool bSet ) override;
- virtual const editeng::SvxBorderLine* GetControlValue() const SAL_OVERRIDE;
- virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) SAL_OVERRIDE;
+ virtual const editeng::SvxBorderLine* GetControlValue() const override;
+ virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) override;
private:
FrameBorderType meBorder; /// The line this wrapper works with.
@@ -115,8 +115,8 @@ public:
MetricField& rMfLeft, MetricField& rMfRight,
MetricField& rMfTop, MetricField& rMfBottom );
- virtual SvxMarginItem GetControlValue() const SAL_OVERRIDE;
- virtual void SetControlValue( SvxMarginItem aItem ) SAL_OVERRIDE;
+ virtual SvxMarginItem GetControlValue() const override;
+ virtual void SetControlValue( SvxMarginItem aItem ) override;
private:
sfx::Int16MetricFieldWrapper maLeftWrp;
@@ -209,8 +209,8 @@ class ShadowControlsWrapper : public sfx::MultiControlWrapper< SvxShadowItem >
public:
explicit ShadowControlsWrapper( ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor );
- virtual SvxShadowItem GetControlValue() const SAL_OVERRIDE;
- virtual void SetControlValue( SvxShadowItem aItem ) SAL_OVERRIDE;
+ virtual SvxShadowItem GetControlValue() const override;
+ virtual void SetControlValue( SvxShadowItem aItem ) override;
private:
ShadowPosWrapper maPosWrp;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index b0cd52c44e6e..6ed9f87c9ab3 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -52,9 +52,9 @@ public:
{
}
virtual ~TabWin_Impl() { disposeOnce(); }
- virtual void dispose() SAL_OVERRIDE { mpPage.clear(); vcl::Window::dispose(); }
+ virtual void dispose() override { mpPage.clear(); vcl::Window::dispose(); }
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; }
void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }