diff options
Diffstat (limited to 'cui/source/options')
36 files changed, 151 insertions, 151 deletions
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 4136f3b89f01..a1a18e47113e 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -35,7 +35,7 @@ private: public: explicit CertPathDialog(vcl::Window* pParent); virtual ~CertPathDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString getDirectory() const; }; diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 5f9a6c8b539a..28b7f67361ed 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -72,7 +72,7 @@ private: { return maPropertyNames; } bool RetrieveOptions(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SvxChartOptions(); @@ -81,7 +81,7 @@ public: const SvxChartColorTable& GetDefaultColors(); void SetDefaultColors( const SvxChartColorTable& aCol ); - virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; }; @@ -94,8 +94,8 @@ public: SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& ); SvxChartColorTableItem( const SvxChartColorTableItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; void SetOptions( SvxChartOptions* pOpts ) const; const SvxChartColorTable & GetColorList() const { return m_aColorTable;} diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 16a7ea5e4871..04d1f32a7828 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -48,9 +48,9 @@ namespace offapp public: explicit DriverListControl(vcl::Window* _pParent); - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; void Update(const DriverPoolingSettings& _rSettings); - virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const SAL_OVERRIDE; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const override; // the handler will be called with a DriverPoolingSettings::const_iterator as parameter, // or NULL if no valid current row exists @@ -65,22 +65,22 @@ namespace offapp bool isModified() const; protected: - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override; + virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override; - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const SAL_OVERRIDE; + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override; - virtual bool SeekRow( long nRow ) SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; + virtual bool SeekRow( long nRow ) override; + virtual bool SaveModified() override; - virtual bool IsTabAllowed(bool _bForward) const SAL_OVERRIDE; + virtual bool IsTabAllowed(bool _bForward) const override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; - virtual void CursorMoved() SAL_OVERRIDE; + virtual void CursorMoved() override; protected: - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override; private: diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 624b266e72a0..39cc30124f24 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -50,15 +50,15 @@ namespace offapp public: ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); virtual ~ConnectionPoolOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: - virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& _rNEvt ) override; - virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rSet) override; + virtual void Reset(const SfxItemSet* _rSet) override; + virtual void ActivatePage( const SfxItemSet& _rSet) override; protected: DECL_LINK_TYPED( OnEnabledDisabled, Button*, void ); diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 26fa8627f240..3c29a8db1bb7 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -77,8 +77,8 @@ namespace offapp DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 434a1845b610..c8bcf65ed1be 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -73,8 +73,8 @@ namespace svx DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const DatabaseRegistrations& getRegistrations() const { return m_aRegistrations; } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 00aae23e0c19..a3f86c803d5c 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -48,7 +48,7 @@ namespace svx public: ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ); virtual ~ODocumentLinkDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 7aae90361019..db822b31e9af 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -36,9 +36,9 @@ class SvxFontSubstCheckListBox : public SvSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void SetTabs() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Resize() override; public: SvxFontSubstCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits) @@ -91,13 +91,13 @@ class SvxFontSubstTabPage : public SfxTabPage virtual ~SvxFontSubstTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 11eacd707df1..db5a7ea95fae 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -35,7 +35,7 @@ public: SvLBoxString( pEntry, nFlags, rTxt ) {} 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; }; diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index e591a438a052..147bbde49fb7 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -30,7 +30,7 @@ namespace svx public: OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nBits); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; }; } // svx #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 45d7fd5457e2..d03d6635c1be 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -34,8 +34,8 @@ public: , bNumericOnly(false) {} - virtual void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvent ) override; + virtual Size GetOptimalSize() const override; }; class CuiAboutConfigTabPage : public ModelessDialog @@ -68,7 +68,7 @@ private: public: explicit CuiAboutConfigTabPage(vcl::Window* pParent); virtual ~CuiAboutConfigTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InsertEntry(const OUString &rPropertyPath, const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue, SvTreeListEntry *pParentEntry = nullptr, bool bInsertToPrefBox = true); void Reset(); @@ -86,7 +86,7 @@ private: public: CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0); virtual ~CuiAboutConfigValueDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString getValue() { diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index c9fe7353630a..11d2a75d973f 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -38,11 +38,11 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage public: SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxAccessibilityOptionsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index dc617b1fea3a..3d3351833a23 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -39,12 +39,12 @@ private: public: SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxBasicIDEOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; }; diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index bd2d2f013717..77641605ca64 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -55,13 +55,13 @@ private: public: SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxDefaultColorOptPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Construct(); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); - virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; + virtual void Reset( const SfxItemSet* rInAttrs ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 916ea82461c6..b9656396dca8 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -174,7 +174,7 @@ class ColorConfigWindow_Impl public: explicit ColorConfigWindow_Impl(vcl::Window* pParent); virtual ~ColorConfigWindow_Impl() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: void SetLinks (Link<Button*,void> const&, Link<ListBox&,void> const&, Link<Control&,void> const&); @@ -269,11 +269,11 @@ private: void SetAppearance(); private: - virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; - virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; + virtual void Command (CommandEvent const& rCEvt) override; + virtual void DataChanged (DataChangedEvent const& rDCEvt) override; - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; bool IsGroupVisible (Group) const; }; @@ -849,13 +849,13 @@ class ColorConfigCtrl_Impl : public VclVBox DECL_LINK_TYPED(ColorHdl, ListBox&, void); DECL_LINK_TYPED(ControlFocusHdl, Control&, void); - virtual bool PreNotify (NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; - virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; + virtual bool PreNotify (NotifyEvent& rNEvt) override; + virtual void Command (CommandEvent const& rCEvt) override; + virtual void DataChanged (DataChangedEvent const& rDCEvt) override; public: explicit ColorConfigCtrl_Impl(vcl::Window* pParent); virtual ~ColorConfigCtrl_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InitHeaderBar(const OUString &rOn, const OUString &rUIElems, const OUString &rColorSetting, const OUString &rPreview); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 3fa8d3a120a7..f66eab3f9b18 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -49,15 +49,15 @@ class SvxColorOptionsTabPage : public SfxTabPage public: SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxColorOptionsTabPage( ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual void FillUserData() override; }; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 3cffb33e08e6..4458e6bfe931 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -44,10 +44,10 @@ private: public: SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCTLOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index d9535fb5dbf0..1607a52c0c54 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -42,13 +42,13 @@ class OfaMSFilterTabPage : public SfxTabPage public: OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -63,9 +63,9 @@ class OfaMSFilterTabPage2 : public SfxTabPage static SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ); void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: - virtual void SetTabs() SAL_OVERRIDE; - virtual void HBarClick() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void SetTabs() override; + virtual void HBarClick() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; public: MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = 0) @@ -88,7 +88,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage VclPtr<RadioButton> aShadingRB; virtual ~OfaMSFilterTabPage2(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ); void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, @@ -99,8 +99,8 @@ public: OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index c2f5fac0e18d..5efcbc243cd0 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -65,17 +65,17 @@ private: DECL_LINK( OnFileDlgToggled, void* ); #endif protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMiscTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; class SvtTabAppearanceCfg; @@ -120,12 +120,12 @@ private: public: OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaViewTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; struct LanguageConfig_Impl; @@ -166,12 +166,12 @@ class OfaLanguagesTabPage : public SfxTabPage public: OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaLanguagesTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 3fce3de5273a..ee3f151516ab 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -51,14 +51,14 @@ class OfaHtmlTabPage : public SfxTabPage public: virtual ~OfaHtmlTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 0183f077af0c..0e49670d4572 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -47,9 +47,9 @@ public: : Edit(pParent, nStyle) , bOnlyNumeric(false) {} - virtual void KeyInput(const KeyEvent& rKEvent) SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvent) override; + virtual void Modify() override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; }; // class SvxProxyTabPage ------------------------------------------------- @@ -101,10 +101,10 @@ private: public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxProxyTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -117,7 +117,7 @@ public: :ListBox(pParent, rResId) {} protected: - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; // class SvxSecurityTabPage --------------------------------------------- @@ -168,16 +168,16 @@ private: SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSecurityTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; struct SvxEMailTabPage_Impl; @@ -200,12 +200,12 @@ class SvxEMailTabPage : public SfxTabPage public: SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxEMailTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index b43d1e90e092..c3b6dcfb98d0 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -121,7 +121,7 @@ public: aStaticTabs[4] = aStaticTabs[3] + nVersionWidth; SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } - virtual void Resize() SAL_OVERRIDE + virtual void Resize() override { svx::SvxRadioButtonListBox::Resize(); setColSizes(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 294f5e910db3..271236dffa8b 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -107,13 +107,13 @@ private: public: SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJavaOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; }; // class SvxJavaParameterDlg --------------------------------------------- @@ -142,9 +142,9 @@ private: public: explicit SvxJavaParameterDlg( vcl::Window* pParent ); virtual ~SvxJavaParameterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; css::uno::Sequence< OUString > GetParameters() const; void SetParameters( css::uno::Sequence< OUString >& rParams ); @@ -175,7 +175,7 @@ private: public: explicit SvxJavaClassPathDlg( vcl::Window* pParent ); virtual ~SvxJavaClassPathDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline const OUString& GetOldPath() const { return m_sOldPath; } inline void SetFocus() { m_pPathList->GrabFocus(); } diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 26fed46c9c3a..eb58df0a09a4 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -61,11 +61,11 @@ private: public: SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJSearchOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; bool IsSaveOptions() const { return bSaveOptions; } void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 278355608267..4010e37cb941 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -263,7 +263,7 @@ public: const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; void BrwStringDic_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, @@ -363,7 +363,7 @@ public: } } virtual ~OptionsBreakSet() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pBeforeFrame.clear(); m_pAfterFrame.clear(); @@ -440,7 +440,7 @@ public: const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; void BrwString_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index a2f1ccbaa695..5a8432d4041f 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -51,17 +51,17 @@ private: inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMemoryOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 8042509293ce..c6263ff7dafc 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -224,7 +224,7 @@ public: ListEntryDialog(vcl::Window* pParent, const OpenCLConfig::ImplMatcher& rEntry, const OString& rTag); virtual ~ListEntryDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { mpOS.clear(); mpOSVersion.clear(); diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 1c57826bfa43..fe91fe1f440f 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -71,13 +71,13 @@ private: public: SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxOpenCLTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; }; #endif diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 06f450723cfc..df61880c755e 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -69,12 +69,12 @@ private: public: SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSaveTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index aaba652011fe..8844826cb69e 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -53,13 +53,13 @@ private: public: SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxOnlineUpdateTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; }; diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 5878033abfd2..fc9c626c5258 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -42,15 +42,15 @@ public: ::rtl::Reference< SearchAndParseThread > m_rApplyThread; SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxPersonalizationTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet ); /// Apply the settings ([OK] button). - virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet ) override; /// Reset to default settings ([Revert] button). - virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet *rSet ) override; void SetPersonaSettings( const OUString& ); @@ -94,7 +94,7 @@ private: public: explicit SelectPersonaDialog( vcl::Window *pParent ); virtual ~SelectPersonaDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ::rtl::Reference< SearchAndParseThread > m_rSearchThread; OUString GetSelectedPersona() const; @@ -122,7 +122,7 @@ private: bool m_bExecute; virtual ~SearchAndParseThread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void getPreviewFile( const OUString&, OUString *, OUString * ); public: diff --git a/cui/source/options/personasdochandler.hxx b/cui/source/options/personasdochandler.hxx index 94c69f403fe7..c54616b271bd 100644 --- a/cui/source/options/personasdochandler.hxx +++ b/cui/source/options/personasdochandler.hxx @@ -27,32 +27,32 @@ public: // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement( const OUString & aName ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters( const OUString & aChars ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction( const OUString & aTarget, const OUString & aData ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONASDOCHANDLER_HXX diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index 19884eefa9a4..8679054f01a2 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -46,7 +46,7 @@ namespace svx public: SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions ); virtual ~SecurityOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); } bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked(); } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e18be0f9cdbe..34e370b06d35 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -252,13 +252,13 @@ private: // variables bool bIsEmailSupported; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: MailMergeCfg_Impl(); virtual ~MailMergeCfg_Impl(); - virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; bool IsEmailSupported() const {return bIsEmailSupported;} diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 003c9771c27f..15d6fe5f11b0 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -32,7 +32,7 @@ private: public: explicit TSAURLsDialog(vcl::Window* pParent); virtual ~TSAURLsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index f7ed38ed8e03..a8e06940a81c 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -38,7 +38,7 @@ namespace svx void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits); void setColWidths(); void Resort( bool bForced ); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; }; class WebConnectionInfoDialog : public ModalDialog @@ -61,7 +61,7 @@ namespace svx public: explicit WebConnectionInfoDialog( vcl::Window* pParent ); virtual ~WebConnectionInfoDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; |