summaryrefslogtreecommitdiff
path: root/cui/source/inc/cuitabarea.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc/cuitabarea.hxx')
-rw-r--r--cui/source/inc/cuitabarea.hxx100
1 files changed, 50 insertions, 50 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index e09587c38d49..95a7163f9522 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -67,10 +67,10 @@ private:
sal_Int32 mnPos;
bool mbAreaTP;
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
protected:
- virtual short Ok() SAL_OVERRIDE;
+ virtual short Ok() override;
DECL_LINK_TYPED( CancelHdlImpl, Button*, void );
void SavePalettes();
@@ -157,21 +157,21 @@ class SvxTransparenceTabPage : public SvxTabPage
public:
SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
virtual ~SvxTransparenceTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
- virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
- virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
- virtual void ChangesApplied() SAL_OVERRIDE;
- virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
- virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet*) override;
+ virtual void Reset(const SfxItemSet*) override;
+ virtual void ChangesApplied() override;
+ virtual void ActivatePage(const SfxItemSet& rSet) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet) override;
+ virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) override;
void SetPageType(sal_uInt16 nInType) { nPageType = nInType; }
void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
- virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
+ virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
/************************************************************************/
@@ -289,19 +289,19 @@ private:
public:
SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxAreaTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAreaRanges; }
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
- virtual void ChangesApplied() SAL_OVERRIDE;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
+ virtual void ChangesApplied() override;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; }
void SetGradientList( XGradientListRef pGrdLst)
@@ -314,7 +314,7 @@ public:
void SetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
void SetPos( sal_uInt16 nInPos ) { m_nPos = nInPos; }
void SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
- virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
+ virtual void PageCreated(const SfxAllItemSet& aSet) override;
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
void SetGrdChgd( ChangeType* pIn ) { m_pnGradientListState = pIn; }
void SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; }
@@ -359,24 +359,24 @@ private:
public:
SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxShadowTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pShadowRanges; }
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; }
void SetPageType( sal_uInt16 nInType ) { m_nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
void SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
- virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
+ virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
/************************************************************************/
@@ -439,16 +439,16 @@ private:
public:
SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxGradientTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; }
void SetGradientList( XGradientListRef pGrdLst)
@@ -517,18 +517,18 @@ private:
public:
SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxHatchTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; }
void SetHatchingList( XHatchListRef pHtchLst)
@@ -542,7 +542,7 @@ public:
void SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
/************************************************************************/
@@ -603,18 +603,18 @@ private:
public:
SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxBitmapTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
- virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override;
void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; }
void SetBitmapList( XBitmapListRef pBitmapList) { m_pBitmapList = pBitmapList; }
@@ -635,7 +635,7 @@ public:
Return a label control that provides a name for the specified
control.
*/
- virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const SAL_OVERRIDE;
+ virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const override;
};
/************************************************************************/
@@ -737,16 +737,16 @@ private:
public:
SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxColorTabPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
- virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
- virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) override;
+ virtual void Reset( const SfxItemSet * ) override;
- virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void ActivatePage( const SfxItemSet& rSet ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override;
void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
@@ -762,7 +762,7 @@ public:
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
bool IsModified()
{