diff options
Diffstat (limited to 'cui/source')
125 files changed, 1011 insertions, 1011 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 49d564bc729c..9fbdffd61c32 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -625,7 +625,7 @@ public: virtual ~SfxAccCfgLBoxString_Impl(); virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c6f363c12eee..5ccc0eca2f63 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1327,7 +1327,7 @@ public: virtual ~PopupPainter() { } 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 { SvLBoxString::Paint(rPos, rOutDev, rRenderContext, pView, rEntry); diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index d415ce84db84..61f2a9ddd0e9 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -48,12 +48,12 @@ public: struct EarlyInit { }; SvxEventConfigPage( vcl::Window *pParent, const SfxItemSet& rSet, EarlyInit ); virtual ~SvxEventConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame ); protected: - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; private: void ImplInitDocument(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index af78386a551b..b06a5323e64e 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -448,7 +448,7 @@ public: IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText, Image* pMacroImg, Image* pComponentImg ); 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; }; diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index f5c183c756ca..efb53e6a26bc 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -50,7 +50,7 @@ private: public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); virtual ~AssignComponentDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString getURL() const { return maURL; } diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 52af93d1f8b2..015b8641194d 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -112,9 +112,9 @@ public: const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; @@ -132,9 +132,9 @@ public: LanguageType GetLanguage() const {return m_eLanguage;} - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; @@ -150,9 +150,9 @@ public: SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ); virtual ~SpellBackgroundAttrib(); - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; }//namespace svx #endif diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a64911f25e7a..54de68e7197f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -122,8 +122,8 @@ public: virtual ~SpellUndoAction_Impl(); - virtual void Undo() SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual void Undo() override; + virtual sal_uInt16 GetId() const override; void SetEnableChangePB(){m_bEnableChangePB = true;} bool IsEnableChangePB(){return m_bEnableChangePB;} diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 50210b2ed32b..d783e887405b 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -136,8 +136,8 @@ class HexColorControl : public Edit public: HexColorControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Paste() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Paste() override; void SetColor( sal_Int32 nColor ); sal_Int32 GetColor(); @@ -258,7 +258,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; void SetColor(const Color& rColor); @@ -307,16 +307,16 @@ public: ColorFieldControl(vcl::Window* pParent, const WinBits& nStyle); virtual ~ColorFieldControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void UpdateBitmap(); void ShowPosition( const Point& rPos, bool bUpdate ); @@ -714,14 +714,14 @@ class ColorSliderControl : public Control public: ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorSliderControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; void UpdateBitmap(); void ChangePosition( long nY ); @@ -985,7 +985,7 @@ public: { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void update_color(sal_uInt16 n = UPDATE_ALL); @@ -1515,20 +1515,20 @@ public: explicit ColorPicker( Reference< XComponentContext > const & xContext ); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; // XInitialization - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; // XPropertyAccess - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override; private: Reference< XComponentContext > mxContext; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 92281b85932c..df88b8429eb1 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -213,10 +213,10 @@ namespace svx public: RubyRadioButton( vcl::Window* _pParent, WinBits nBits ); void init( const OUString& rPrimaryText, const OUString& rSecondaryText, const PseudoRubyText::RubyPosition& rPosition ); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) override; private: PseudoRubyText m_aRubyText; diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index c6bf6b04d47d..7335f21a04de 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -31,7 +31,7 @@ namespace { NoApplyDialog(vcl::Window *pParent, const OUString &rId, const OUString &rXML) : SvxStandardDialog(pParent, rId, rXML) { } protected: - virtual void Apply() SAL_OVERRIDE {} + virtual void Apply() override {} }; } diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index f302947b9fb3..2546ecc5844b 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -54,7 +54,7 @@ public: SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& 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; }; #endif diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 0ea224897c4c..8069f073f5d2 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1407,7 +1407,7 @@ public: m_pDialog.reset( VclPtr<SvxMacroAssignDlg>::Create( _pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent ) ); } - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; virtual ~SvxMacroAssignDialog(); private: diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 5e94fcb09947..1bb596dd21d8 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -67,7 +67,7 @@ public: \ explicit Class( DialogClass* p) \ : pDlg(p) \ {} \ - virtual short Execute() SAL_OVERRIDE ; + virtual short Execute() override ; #define IMPL_ABSTDLG_BASE(Class) \ short Class::Execute() \ @@ -82,8 +82,8 @@ class VclAbstractDialog2_Impl : public VclAbstractDialog2 public: explicit VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} virtual ~VclAbstractDialog2_Impl(); - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; - virtual long GetResult() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; + virtual long GetResult() override; private: DECL_LINK( EndDialogHdl, Dialog* ); }; @@ -96,30 +96,30 @@ class CuiVclAbstractDialog_Impl : public VclAbstractDialog class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog { DECL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl,Dialog) - virtual void Update() SAL_OVERRIDE ; + virtual void Update() override ; }; class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const override; //From class Window. - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE ; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override ; }; class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog) - virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; - virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; + virtual void SetCurPageId( sal_uInt16 nId ) override; + virtual void SetCurPageId( const OString& rName ) override; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; + virtual void SetInputSet( const SfxItemSet* pInSet ) override; //From class Window. - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; class SvxDistributeDialog; @@ -127,67 +127,67 @@ class AbstractSvxDistributeDialog_Impl: public AbstractSvxDistributeDialog { DECL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl,SvxDistributeDialog) public: - virtual SvxDistributeHorizontal GetDistributeHor() const SAL_OVERRIDE; - virtual SvxDistributeVertical GetDistributeVer() const SAL_OVERRIDE; + virtual SvxDistributeHorizontal GetDistributeHor() const override; + virtual SvxDistributeVertical GetDistributeVer() const override; }; class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog { DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog) - virtual void EndDialog(long nResult = 0) SAL_OVERRIDE; - virtual void EnableRubySupport( bool _bVal ) SAL_OVERRIDE; - virtual void SetByCharacter( bool _bByCharacter ) SAL_OVERRIDE ; - virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE; - virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE; - virtual void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) SAL_OVERRIDE; - virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE; - virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; - virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; - virtual void SetChangeAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; - virtual void SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl ) SAL_OVERRIDE ; - virtual void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; - virtual void SetFindHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE; - virtual bool GetUseBothDirections( ) const SAL_OVERRIDE; + virtual void EndDialog(long nResult = 0) override; + virtual void EnableRubySupport( bool _bVal ) override; + virtual void SetByCharacter( bool _bByCharacter ) override ; + virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) override; + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) override; + virtual void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) override; + virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) override; + virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) override ; + virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) override ; + virtual void SetChangeAllHdl( const Link<Button*,void>& _rHdl ) override ; + virtual void SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl ) override ; + virtual void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) override ; + virtual void SetFindHdl( const Link<Button*,void>& _rHdl ) override; + virtual bool GetUseBothDirections( ) const override; virtual editeng::HangulHanjaConversion::ConversionDirection - GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE; + GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const override; virtual void SetCurrentString( const OUString& _rNewString, const css::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true - ) SAL_OVERRIDE; - virtual OUString GetCurrentString( ) const SAL_OVERRIDE ; + ) override; + virtual OUString GetCurrentString( ) const override ; virtual editeng::HangulHanjaConversion::ConversionFormat - GetConversionFormat( ) const SAL_OVERRIDE ; - virtual void FocusSuggestion( ) SAL_OVERRIDE; - virtual OUString GetCurrentSuggestion( ) const SAL_OVERRIDE; + GetConversionFormat( ) const override ; + virtual void FocusSuggestion( ) override; + virtual OUString GetCurrentSuggestion( ) const override; }; class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog { DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) - virtual OUString GetWord() SAL_OVERRIDE; + virtual OUString GetWord() override; }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog { DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) - virtual vcl::Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() override; }; class FmShowColsDialog; class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog { DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog) - virtual void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols) SAL_OVERRIDE; + virtual void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols) override; }; class SvxZoomDialog; class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog { DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog) - virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) SAL_OVERRIDE; - virtual void HideButton( ZoomButtonId nBtnId ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE ; + virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) override; + virtual void HideButton( ZoomButtonId nBtnId ) override; + virtual const SfxItemSet* GetOutputItemSet() const override ; }; @@ -196,16 +196,16 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog { public: DECL_ABSTDLG_BASE(AbstractSpellDialog_Impl, svx::SpellDialog) - virtual void Invalidate() SAL_OVERRIDE; - virtual vcl::Window* GetWindow() SAL_OVERRIDE; - virtual SfxBindings& GetBindings() SAL_OVERRIDE; + virtual void Invalidate() override; + virtual vcl::Window* GetWindow() override; + virtual SfxBindings& GetBindings() override; }; class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress { DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress) - virtual void Update() SAL_OVERRIDE ; + virtual void Update() override ; }; @@ -213,7 +213,7 @@ class TakeProgress; class AbstractTakeProgress_Impl : public AbstractTakeProgress { DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress) - virtual void Update() SAL_OVERRIDE ; + virtual void Update() override ; }; @@ -221,7 +221,7 @@ class TitleDialog; class AbstractTitleDialog_Impl : public AbstractTitleDialog { DECL_ABSTDLG_BASE(AbstractTitleDialog_Impl,TitleDialog) - virtual OUString GetTitle() const SAL_OVERRIDE ; + virtual OUString GetTitle() const override ; }; @@ -231,16 +231,16 @@ class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog DECL_ABSTDLG_BASE( AbstractScriptSelectorDialog_Impl, SvxScriptSelectorDialog) - virtual OUString GetScriptURL() const SAL_OVERRIDE; + virtual OUString GetScriptURL() const override; - virtual void SetRunLabel() SAL_OVERRIDE; + virtual void SetRunLabel() override; }; class GalleryIdDialog; class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog { DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog) - virtual sal_uLong GetId() const SAL_OVERRIDE ; + virtual sal_uLong GetId() const override ; }; @@ -248,11 +248,11 @@ class URLDlg; class AbstractURLDlg_Impl :public AbstractURLDlg { DECL_ABSTDLG_BASE(AbstractURLDlg_Impl,URLDlg) - virtual OUString GetURL() const SAL_OVERRIDE; - virtual OUString GetAltText() const SAL_OVERRIDE; - virtual OUString GetDesc() const SAL_OVERRIDE; - virtual OUString GetTarget() const SAL_OVERRIDE; - virtual OUString GetName() const SAL_OVERRIDE; + virtual OUString GetURL() const override; + virtual OUString GetAltText() const override; + virtual OUString GetDesc() const override; + virtual OUString GetTarget() const override; + virtual OUString GetName() const override; }; class SvxHlinkDlgMarkWnd; @@ -266,70 +266,70 @@ class SvxSearchSimilarityDialog; class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog { DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog) - virtual sal_uInt16 GetOther() SAL_OVERRIDE; - virtual sal_uInt16 GetShorter() SAL_OVERRIDE; - virtual sal_uInt16 GetLonger() SAL_OVERRIDE; - virtual bool IsRelaxed() SAL_OVERRIDE; + virtual sal_uInt16 GetOther() override; + virtual sal_uInt16 GetShorter() override; + virtual sal_uInt16 GetLonger() override; + virtual bool IsRelaxed() override; }; class SvxJSearchOptionsDialog; class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog { DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog) - virtual sal_Int32 GetTransliterationFlags() const SAL_OVERRIDE; + virtual sal_Int32 GetTransliterationFlags() const override; }; class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog { DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog) - virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE; - virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; - virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override; + virtual void SetCurPageId( sal_uInt16 nId ) override; + virtual void SetCurPageId( const OString& rName ) override; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; + virtual void SetInputSet( const SfxItemSet* pInSet ) override; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog { DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog) - virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE; - virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; - virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override; + virtual void SetCurPageId( sal_uInt16 nId ) override; + virtual void SetCurPageId( const OString& rName ) override; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; + virtual void SetInputSet( const SfxItemSet* pInSet ) override; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; class FmInputRecordNoDialog; class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog { DECL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl,FmInputRecordNoDialog) - virtual void SetValue(long nNew) SAL_OVERRIDE ; - virtual long GetValue() const SAL_OVERRIDE ; + virtual void SetValue(long nNew) override ; + virtual long GetValue() const override ; }; class SvxNewDictionaryDialog; class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog { DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog) - virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() SAL_OVERRIDE; + virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() override; }; class SvxNameDialog; class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog { DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) - virtual void GetName( OUString& rName ) SAL_OVERRIDE ; - virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ; - virtual void SetEditHelpId(const OString&) SAL_OVERRIDE ; + virtual void GetName( OUString& rName ) override ; + virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) override ; + virtual void SetEditHelpId(const OString&) override ; //from class Window - virtual void SetHelpId( const OString& ) SAL_OVERRIDE ; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ; + virtual void SetHelpId( const OString& ) override ; + virtual void SetText( const OUString& rStr ) override ; private: Link<AbstractSvxNameDialog&,bool> aCheckNameHdl; DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool); @@ -341,8 +341,8 @@ class SvxObjectTitleDescDialog; class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog { DECL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl, SvxObjectNameDialog) - virtual void GetName(OUString& rName) SAL_OVERRIDE ; - virtual void SetCheckNameHdl(const Link<AbstractSvxObjectNameDialog&,bool>& rLink, bool bCheckImmediately = false) SAL_OVERRIDE; + virtual void GetName(OUString& rName) override ; + virtual void SetCheckNameHdl(const Link<AbstractSvxObjectNameDialog&,bool>& rLink, bool bCheckImmediately = false) override; private: Link<AbstractSvxObjectNameDialog&,bool> aCheckNameHdl; @@ -352,8 +352,8 @@ private: class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog { DECL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl, SvxObjectTitleDescDialog) - virtual void GetTitle(OUString& rName) SAL_OVERRIDE; - virtual void GetDescription(OUString& rName) SAL_OVERRIDE; + virtual void GetTitle(OUString& rName) override; + virtual void GetDescription(OUString& rName) override; }; class SvxMessDialog; @@ -366,26 +366,26 @@ class SvxMultiPathDialog; class AbstractSvxMultiPathDialog_Impl : public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl,SvxMultiPathDialog) - virtual OUString GetPath() const SAL_OVERRIDE; - virtual void SetPath( const OUString& rPath ) SAL_OVERRIDE; - virtual void SetTitle( const OUString& rNewTitle ) SAL_OVERRIDE; + virtual OUString GetPath() const override; + virtual void SetPath( const OUString& rPath ) override; + virtual void SetTitle( const OUString& rNewTitle ) override; }; class SvxPathSelectDialog; class AbstractSvxPathSelectDialog_Impl : public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxPathSelectDialog_Impl,SvxPathSelectDialog) - virtual OUString GetPath() const SAL_OVERRIDE; - virtual void SetPath( const OUString& rPath ) SAL_OVERRIDE; - virtual void SetTitle( const OUString& rNewTitle ) SAL_OVERRIDE; + virtual OUString GetPath() const override; + virtual void SetPath( const OUString& rPath ) override; + virtual void SetTitle( const OUString& rNewTitle ) override; }; class SvxHpLinkDlg; class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg { DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg) - virtual vcl::Window* GetWindow() SAL_OVERRIDE; - virtual bool QueryClose() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() override; + virtual bool QueryClose() override; }; class FmSearchDialog; @@ -393,48 +393,48 @@ struct FmFoundRecordInformation; class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog { DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog) - virtual void SetFoundHandler(const Link<FmFoundRecordInformation&,void>& lnk) SAL_OVERRIDE ; - virtual void SetCanceledNotFoundHdl(const Link<FmFoundRecordInformation&,void>& lnk) SAL_OVERRIDE; - virtual void SetActiveField(const OUString& strField) SAL_OVERRIDE; + virtual void SetFoundHandler(const Link<FmFoundRecordInformation&,void>& lnk) override ; + virtual void SetCanceledNotFoundHdl(const Link<FmFoundRecordInformation&,void>& lnk) override; + virtual void SetActiveField(const OUString& strField) override; }; class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog { DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog) - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; }; class SvxAreaTabDialog; class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog { DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog) - virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; - virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; + virtual void SetCurPageId( sal_uInt16 nId ) override; + virtual void SetCurPageId( const OString& rName ) override; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; + virtual void SetInputSet( const SfxItemSet* pInSet ) override; // From class Window. - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog { DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) - virtual css::uno::Reference < css::embed::XEmbeddedObject > GetObject() SAL_OVERRIDE; - virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; - virtual bool IsCreateNew() SAL_OVERRIDE; + virtual css::uno::Reference < css::embed::XEmbeddedObject > GetObject() override; + virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override; + virtual bool IsCreateNew() override; }; class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog { public: DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog ) - virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) SAL_OVERRIDE; - virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) SAL_OVERRIDE; + virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) override; + virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) override; virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, - const TransferableObjectDescriptor* pDesc=0 ) SAL_OVERRIDE; + const TransferableObjectDescriptor* pDesc=0 ) override; }; class AbstractLinksDialog_Impl : public SfxAbstractLinksDialog @@ -447,17 +447,17 @@ class SvxPostItDialog; class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog { DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog ) - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; //From class Window - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual void SetPrevHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) SAL_OVERRIDE ; - virtual void SetNextHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) SAL_OVERRIDE ; - virtual void EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ; - virtual OUString GetNote() SAL_OVERRIDE ; - virtual void SetNote(const OUString& rTxt) SAL_OVERRIDE ; - virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) SAL_OVERRIDE ; - virtual void DontChangeAuthor() SAL_OVERRIDE ; - virtual void HideAuthor() SAL_OVERRIDE ; - virtual vcl::Window * GetWindow() SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; //From class Window + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual void SetPrevHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) override ; + virtual void SetNextHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) override ; + virtual void EnableTravel(bool bNext, bool bPrev) override ; + virtual OUString GetNote() override ; + virtual void SetNote(const OUString& rTxt) override ; + virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) override ; + virtual void DontChangeAuthor() override ; + virtual void HideAuthor() override ; + virtual vcl::Window * GetWindow() override; private: Link<AbstractSvxPostItDialog&,void> aNextHdl; Link<AbstractSvxPostItDialog&,void> aPrevHdl; @@ -470,186 +470,186 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod { DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog ) - virtual OUString GetPasswordToOpen() const SAL_OVERRIDE; - virtual OUString GetPasswordToModify() const SAL_OVERRIDE; - virtual bool IsRecommendToOpenReadonly() const SAL_OVERRIDE; + virtual OUString GetPasswordToOpen() const override; + virtual OUString GetPasswordToModify() const override; + virtual bool IsRecommendToOpenReadonly() const override; }; //AbstractDialogFactory_Impl implementations class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) override; virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, - sal_uInt32 nResId ) SAL_OVERRIDE; + sal_uInt32 nResId ) override; virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const css::uno::Reference< css::frame::XFrame >& _rxFrame, - sal_uInt32 nResId ) SAL_OVERRIDE; + sal_uInt32 nResId ) override; virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rxFrame, sal_uInt32 nResId, - const OUString& rParameter ) SAL_OVERRIDE; + const OUString& rParameter ) override; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, - const OUString *pUserButtonText=0 ) SAL_OVERRIDE; + const OUString *pUserButtonText=0 ) override; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame, bool bEditFmt=false, - const OUString *pUserButtonText=0 ) SAL_OVERRIDE; + const OUString *pUserButtonText=0 ) override; virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, - SdrModel* pModel=0 ) SAL_OVERRIDE; + SdrModel* pModel=0 ) override; virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, - const SfxItemSet& rSet) SAL_OVERRIDE; + const SfxItemSet& rSet) override; virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0 ) SAL_OVERRIDE; + sal_uInt16 nAnchorTypes = 0 ) override; virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, - SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE; + SvxDistributeVertical eVer = SvxDistributeVerticalNone) override; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const css::uno::Reference < css::embed::XStorage >& xStor, - const SvObjectServerList* pList = 0 ) SAL_OVERRIDE; + const SvObjectServerList* pList = 0 ) override; virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand, - const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; - virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) SAL_OVERRIDE; - virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; + const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) override; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) override; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, - editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE; + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) override; virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, - const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE; + const OUString &rWord, sal_Int16 nLanguage ) override; virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, - SvxSpellWrapper* pWrapper ) SAL_OVERRIDE; + SvxSpellWrapper* pWrapper ) override; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) override; virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, - const SfxItemSet& rCoreSet) SAL_OVERRIDE; + const SfxItemSet& rCoreSet) override; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, - bool bEnableDrawingLayerFillStyles = false) SAL_OVERRIDE; + bool bEnableDrawingLayerFillStyles = false) override; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0) SAL_OVERRIDE ; + sal_uInt16 nAnchorTypes = 0) override ; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false - ) SAL_OVERRIDE; + ) override; virtual AbstractSpellDialog * CreateSvxSpellDialog( vcl::Window* pParent, SfxBindings* pBindings, - svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE; + svx::SpellDialogChildWindow* pSpellChildWindow ) override; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) override; virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, - const OUString& rOldText) SAL_OVERRIDE; + const OUString& rOldText) override; virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, - GalleryTheme* pThm) SAL_OVERRIDE; + GalleryTheme* pThm) override; virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, - SfxItemSet* pItemSet) SAL_OVERRIDE; + SfxItemSet* pItemSet) override; virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, - TargetList& rTargetList ) SAL_OVERRIDE; + TargetList& rTargetList ) override; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, - const sal_uInt16* pWhRanges) SAL_OVERRIDE; + const sal_uInt16* pWhRanges) override; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, - sal_uInt16 nLonger) SAL_OVERRIDE; + sal_uInt16 nLonger) override; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, - sal_Int32 nInitialFlags) SAL_OVERRIDE; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) SAL_OVERRIDE; + sal_Int32 nInitialFlags) override; + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) override; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, - css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; + css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) override; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl, - sal_uInt32 nResId) SAL_OVERRIDE; + sal_uInt32 nResId) override; virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, - const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE; + const OUString& rName, const OUString& rDesc ) override; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) SAL_OVERRIDE; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) override; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) override; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) override; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) override; virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, - sal_uInt32 nResId) SAL_OVERRIDE; + sal_uInt32 nResId) override; virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) SAL_OVERRIDE; + const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, - const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE; + const Graphic& rGraphic, RECT_POINT eLightSource) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; + const Graphic& rGraphic, sal_uInt16 nCount) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, - const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; + const Graphic& rGraphic, sal_uInt16 nCount) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, - const Graphic& rGraphic, double nRadius) SAL_OVERRIDE; + const Graphic& rGraphic, double nRadius) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, - bool bInvert) SAL_OVERRIDE; + bool bInvert) override; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, - bool bEnhanceEdges) SAL_OVERRIDE; + bool bEnhanceEdges) override; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, - bool bShadow ) SAL_OVERRIDE; + bool bShadow ) override; virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, - bool bHasObj = true ) SAL_OVERRIDE; + bool bHasObj = true ) override; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, - bool bPrevNext = false ) SAL_OVERRIDE; + bool bPrevNext = false ) override; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) override; - virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; - virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) override; + virtual DialogGetRanges GetDialogGetRangesFunc() override; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) override; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( vcl::Window* pParent, bool bShowSlots, const css::uno::Reference< css::frame::XFrame >& _rxFrame - ) SAL_OVERRIDE; + ) override; virtual VclAbstractDialog* CreateScriptErrorDialog( - vcl::Window* pParent, const css::uno::Any& rException) SAL_OVERRIDE; + vcl::Window* pParent, const css::uno::Any& rException) override; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( vcl::Window* _pParent, @@ -657,20 +657,20 @@ public: const bool _bUnoDialogMode, const css::uno::Reference< css::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent - ) SAL_OVERRIDE; + ) override; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) override; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) SAL_OVERRIDE ; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) override ; virtual VclAbstractDialog* CreateOptionsDialog( - vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) override; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) override; - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) override; }; #endif diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 907beeafff60..717762349810 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -72,15 +72,15 @@ private: inline SpellDialog* GetSpellDialog() const; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); - void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} + void SetModifyHdl(const Link<>& rLink) override { m_aModifyLink = rLink;} void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); - void SetText( const OUString& rStr ) SAL_OVERRIDE; + void SetText( const OUString& rStr ) override; bool MarkNextError( bool bIgnoreCurrentError, css::uno::Reference<css::linguistic2::XSpellChecker1> ); void ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage); @@ -95,7 +95,7 @@ public: void ResetModified() { GetTextEngine()->SetModified(false); m_bIsUndoEditMode = false;} - virtual bool IsModified() const SAL_OVERRIDE { return GetTextEngine()->IsModified(); } + virtual bool IsModified() const override { return GetTextEngine()->IsModified(); } bool IsUndoEditMode() const { return m_bIsUndoEditMode;} void SetUndoEditMode(bool bSet); @@ -210,7 +210,7 @@ private: void SetTitle_Impl(LanguageType nLang); protected: - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; OUString getReplacementString() const; @@ -220,9 +220,9 @@ public: vcl::Window * pParent, SfxBindings* pBindings); virtual ~SpellDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; void InvalidateDialog(); }; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 3928056c88a1..aaea46556271 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -60,14 +60,14 @@ private: static OUString GetLocaleString(); protected: - virtual bool Close() SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual bool Close() override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; public: AboutDialog(vcl::Window* pParent); virtual ~AboutDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( HandleClick, Button*, void ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index df4b62dcd42a..dbcd06c39057 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -55,11 +55,11 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox { VclPtr<SfxAcceleratorConfigPage> m_pAccelConfigPage; - void KeyInput( const KeyEvent &rKEvt ) SAL_OVERRIDE; + void KeyInput( const KeyEvent &rKEvt ) override; protected: virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, - const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; + const Image&, SvLBoxButtonKind eButtonKind) override; public: SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle) @@ -68,7 +68,7 @@ public: { } virtual ~SfxAccCfgTabListBox_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage) { @@ -172,10 +172,10 @@ private: public: SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index cc43a7366a16..6c7d73fb9452 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -59,15 +59,15 @@ class AlignmentTabPage : public SfxTabPage public: virtual ~AlignmentTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges() { return s_pRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: explicit AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 011063728a50..073b728d2845 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -54,7 +54,7 @@ public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); virtual ~OfaAutoCorrDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void EnableLanguage(bool bEnable); }; @@ -68,9 +68,9 @@ class OfaACorrCheckListBox : public SvSimpleTable using SvTreeListBox::SetCheckButtonState; 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: OfaACorrCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) @@ -110,14 +110,14 @@ private: public: OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~OfaAutocorrOptionsPage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; }; @@ -169,14 +169,14 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSwAutoFmtOptionsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; }; // class AutoCorrEdit ---------------------------------------------------- @@ -198,7 +198,7 @@ class AutoCorrEdit : public Edit void SetSpaces(bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) override; }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -266,16 +266,16 @@ private: public: OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; + virtual void Resize() override; + virtual void StateChanged(StateChangedType nStateChange) override; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); @@ -327,15 +327,15 @@ private: public: OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrExceptPage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; void SetLanguage(LanguageType eSet); }; @@ -395,14 +395,14 @@ private: OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaQuoteTabPage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; }; // class OfaAutoCompleteTabPage --------------------------------------------- @@ -421,9 +421,9 @@ public: { } virtual ~AutoCompleteMultiListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetPage(OfaAutoCompleteTabPage *pPage) { m_pPage = pPage; } - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; private: @@ -449,13 +449,13 @@ private: const SfxItemSet& rSet ); public: virtual ~OfaAutoCompleteTabPage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; void CopyToClipboard() const; DECL_LINK_TYPED(DeleteHdl, Button*, void); @@ -514,13 +514,13 @@ public: /// construction via Create() OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSmartTagOptionsTabPage(); - 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 void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& ) override; }; #endif diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index b42cc67acfff..05d6806038b9 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -52,24 +52,24 @@ public: // returns the area of the which-values static const sal_uInt16* GetRanges() { return pPageRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; - virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; /// Shift-ListBox activation void ShowSelector(); /// for the Writer (cells/rows/tables) void ShowTblControl(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxBackgroundTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; VclPtr<VclContainer> m_pAsGrid; VclPtr<FixedText> m_pSelectTxt; diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index ca5d43550925..6d57b8ac0bdc 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -33,7 +33,7 @@ public: bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; private: /// bitfield diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 245d5bc24a50..1817195fd132 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -47,21 +47,21 @@ class SvxBorderTabPage : public SfxTabPage public: virtual ~SvxBorderTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } - virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) override; + virtual void Reset( const SfxItemSet* ) override; + virtual void ChangesApplied() override; void HideShadowControls(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; void SetTableMode(); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c23e1f0af162..e768576f1857 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -66,7 +66,7 @@ private: public: SvxConfigDialog( vcl::Window*, const SfxItemSet* ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); }; @@ -189,12 +189,12 @@ public: virtual ~MenuSaveInData(); /// methods inherited from SaveInData - SvxEntries* GetEntries() SAL_OVERRIDE; - void SetEntries( SvxEntries* ) SAL_OVERRIDE; - bool HasURL( const OUString& URL ) SAL_OVERRIDE { (void)URL; return false; } - bool HasSettings() SAL_OVERRIDE { return m_xMenuSettings.is(); } - void Reset() SAL_OVERRIDE; - bool Apply() SAL_OVERRIDE; + SvxEntries* GetEntries() override; + void SetEntries( SvxEntries* ) override; + bool HasURL( const OUString& URL ) override { (void)URL; return false; } + bool HasSettings() override { return m_xMenuSettings.is(); } + void Reset() override; + bool Apply() override; }; class SvxConfigEntry @@ -299,24 +299,24 @@ protected: public: SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) override; virtual TriState NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; + SvTreeListEntry*&, sal_uLong& ) override; virtual TriState NotifyCopying( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; + SvTreeListEntry*&, sal_uLong&) override; virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvTreeListEntry* ) SAL_OVERRIDE; + TransferDataContainer&, SvTreeListEntry* ) override; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) override; - void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; + void KeyInput( const KeyEvent& rKeyEvent ) override; }; class SvxConfigPage : public SfxTabPage @@ -395,7 +395,7 @@ protected: public: virtual ~SvxConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static bool CanConfig( const OUString& rModuleId ); @@ -410,8 +410,8 @@ public: bool MoveEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - void Reset( const SfxItemSet* ) SAL_OVERRIDE; + bool FillItemSet( SfxItemSet* ) override; + void Reset( const SfxItemSet* ) override; virtual bool DeleteSelectedContent() = 0; virtual void DeleteSelectedTopLevel() = 0; @@ -448,16 +448,16 @@ private: DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); - void Init() SAL_OVERRIDE; - void UpdateButtonStates() SAL_OVERRIDE; - short QueryReset() SAL_OVERRIDE; - bool DeleteSelectedContent() SAL_OVERRIDE; - void DeleteSelectedTopLevel() SAL_OVERRIDE; + void Init() override; + void UpdateButtonStates() override; + short QueryReset() override; + bool DeleteSelectedContent() override; + void DeleteSelectedTopLevel() override; public: SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SaveInData* CreateSaveInData( const css::uno::Reference < @@ -465,7 +465,7 @@ public: const css::uno::Reference < css::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ) SAL_OVERRIDE; + bool docConfig ) override; }; class SvxMainMenuOrganizerDialog : public ModalDialog @@ -491,7 +491,7 @@ public: vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); virtual ~SvxMainMenuOrganizerDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvxEntries* GetEntries() { return mpEntries;} SvxConfigEntry* GetSelectedEntry(); @@ -507,8 +507,8 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox protected: - virtual void CheckButtonHdl() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void CheckButtonHdl() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void BuildCheckBoxButtonImages( SvLBoxButtonData* ); Image GetSizedImage( VirtualDevice& aDev, const Size& aNewSize, const Image& aImage ); @@ -517,15 +517,15 @@ public: SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual TriState NotifyMoving( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) override; virtual TriState NotifyCopying( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) override; - void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; + void KeyInput( const KeyEvent& rKeyEvent ) override; }; class SvxToolbarConfigPage : public SvxConfigPage @@ -541,22 +541,22 @@ private: DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); DECL_LINK_TYPED( MoveHdl, Button *, void ); - void UpdateButtonStates() SAL_OVERRIDE; - short QueryReset() SAL_OVERRIDE; - void Init() SAL_OVERRIDE; - bool DeleteSelectedContent() SAL_OVERRIDE; - void DeleteSelectedTopLevel() SAL_OVERRIDE; + void UpdateButtonStates() override; + short QueryReset() override; + void Init() override; + bool DeleteSelectedContent() override; + void DeleteSelectedTopLevel() override; public: SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, bool bFront = false, bool bAllowDuplicates = true ); - void MoveEntry( bool bMoveUp ) SAL_OVERRIDE; + void MoveEntry( bool bMoveUp ) override; SaveInData* CreateSaveInData( const css::uno::Reference < @@ -564,7 +564,7 @@ public: const css::uno::Reference < css::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ) SAL_OVERRIDE; + bool docConfig ) override; }; class ToolbarSaveInData : public SaveInData @@ -611,12 +611,12 @@ public: css::uno::Reference< css::frame::XFrame > xFrame, const OUString& rResourceURL, sal_Int32 nStyle ); - SvxEntries* GetEntries() SAL_OVERRIDE; - void SetEntries( SvxEntries* ) SAL_OVERRIDE; - bool HasSettings() SAL_OVERRIDE; - bool HasURL( const OUString& rURL ) SAL_OVERRIDE; - void Reset() SAL_OVERRIDE; - bool Apply() SAL_OVERRIDE; + SvxEntries* GetEntries() override; + void SetEntries( SvxEntries* ) override; + bool HasSettings() override; + bool HasURL( const OUString& rURL ) override; + void Reset() override; + bool Apply() override; }; class SvxNewToolbarDialog : public ModalDialog @@ -628,7 +628,7 @@ private: public: SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); virtual ~SvxNewToolbarDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; VclPtr<ListBox> m_pSaveInListBox; @@ -684,7 +684,7 @@ public: ); virtual ~SvxIconSelectorDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); @@ -718,7 +718,7 @@ private: public: SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); virtual ~SvxIconChangeDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index d7118faaa7c6..fbfa54660544 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -104,12 +104,12 @@ class SfxConfigFunctionListBox : public SvTreeListBox SfxGroupInfoArr_Impl aArr; SfxStylesInfo_Impl* pStylesInfo; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; public: SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle); virtual ~SfxConfigFunctionListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ClearAll(); using Window::GetHelpText; @@ -152,13 +152,13 @@ class SfxConfigGroupListBox : public SvTreeListBox SfxStylesInfo_Impl* pStylesInfo; protected: - virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry *pEntry) override; + virtual bool Expand( SvTreeListEntry* pParent ) override; public: SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SfxConfigGroupListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ClearAll(); void Init(const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index b2415cfde7d4..aa47ede58c17 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -52,12 +52,12 @@ protected: public: virtual ~SvxCharBasePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) override; }; @@ -140,19 +140,19 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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: virtual ~SvxCharNamePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pNameRanges; } - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -161,7 +161,7 @@ public: void SetPreviewBackgroundToCharacter(); void DisableControls( sal_uInt16 nDisable ); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; // class SvxCharEffectsPage ---------------------------------------------- @@ -225,24 +225,24 @@ private: public: virtual ~SvxCharEffectsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pEffectsRanges; } - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; // class SvxCharPositionPage --------------------------------------------- @@ -306,25 +306,25 @@ private: public: virtual ~SvxCharPositionPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; + virtual void ActivatePage( const SfxItemSet& rSet ) override; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pPositionRanges; } - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; + virtual void FillUserData() override; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; // class SvxCharTwoLinesPage --------------------------------------------- @@ -354,22 +354,22 @@ private: public: virtual ~SvxCharTwoLinesPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } - 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; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #endif // INCLUDED_CUI_SOURCE_INC_CHARDLG_HXX diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index e02333a01197..abf5a02635d8 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -64,17 +64,17 @@ public: SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxConnectionPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet * ) override; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; /* Derived from SfxSingleTabDialog, in order to be informed about diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index f5708e4b00f9..1fa77d2dbbcb 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -42,15 +42,15 @@ public: SvxShowText(vcl::Window* pParent, bool bCenter = false); void SetFont( const vcl::Font& rFont ); - void SetText( const OUString& rText ) SAL_OVERRIDE; + void SetText( const OUString& rText ) override; void SetCentered(bool bCenter) { mbCenter = bCenter; } - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; private: long mnY; @@ -94,7 +94,7 @@ private: public: SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DisableFontSelection(); @@ -106,7 +106,7 @@ public: OUString GetCharacters() const; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; #endif diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index e202360e677e..da70430e3c6c 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -111,7 +111,7 @@ public: const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier); virtual ~FmSearchDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** The found-handler gets in the 'found'-case a pointer on a FmFoundRecordInformation-structure (which is only valid in the handler; so if one needs to memorize the data, don't copy the pointer but @@ -132,7 +132,7 @@ public: inline void SetActiveField(const OUString& strField); protected: - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; void Init(const OUString& strVisibleFields, const OUString& strInitialText); // only to be used out of the constructors diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 645c6a973319..93594cab285d 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -69,7 +69,7 @@ private: bool bRecursive ); virtual ~SearchThread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; public: @@ -94,12 +94,12 @@ private: public: SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); virtual ~SearchProgress(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( CleanUpHdl, void*, void ); - virtual short Execute() SAL_OVERRIDE; - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; + virtual short Execute() override; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; void SetFileType( const OUString& rType ) { m_pFtSearchType->SetText( rType ); } void SetDirectory( const INetURLObject& rURL ) { m_pFtSearchDir->SetText( GetReducedString( rURL, 30 ) ); } }; @@ -113,7 +113,7 @@ private: TokenList_impl& mrTakenList; virtual ~TakeThread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; public: @@ -140,13 +140,13 @@ public: TakeProgress( vcl::Window* pWindow ); virtual ~TakeProgress(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( CleanUpHdl, void*, void ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } - virtual short Execute() SAL_OVERRIDE; - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; + virtual short Execute() override; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; }; class ActualizeProgress : public ModalDialog @@ -165,9 +165,9 @@ private: public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); virtual ~ActualizeProgress(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; class TitleDialog : public ModalDialog @@ -177,7 +177,7 @@ private: public: TitleDialog(vcl::Window* pParent, const OUString& rOldText); virtual ~TitleDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetTitle() const { return m_pEdit->GetText(); } }; @@ -192,7 +192,7 @@ private: public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -203,7 +203,7 @@ class GalleryThemeProperties : public SfxTabDialog sal_uInt16 m_nGeneralPageId; sal_uInt16 m_nFilesPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override; public: GalleryThemeProperties(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); @@ -221,15 +221,15 @@ private: VclPtr<FixedText> m_pFtMSShowChangeDate; ExchangeData* pData; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE {} - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) override {} + virtual bool FillItemSet( SfxItemSet* rSet ) override; public: TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~TPGalleryThemeGeneral(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetXChgData( ExchangeData* pData ); @@ -269,8 +269,8 @@ class TPGalleryThemeProperties : public SfxTabPage css::uno::Reference< css::media::XPlayer > xMediaPlayer; css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; - virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {} - virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; } + virtual void Reset( const SfxItemSet* /*rSet*/ ) override {} + virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) override { return true; } static OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); @@ -292,7 +292,7 @@ class TPGalleryThemeProperties : public SfxTabPage public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); virtual ~TPGalleryThemeProperties(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 1a9e1b66a84f..021e6a348541 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -42,9 +42,9 @@ private: double mfScaleX; double mfScaleY; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; void ScaleImageToFit(); @@ -86,7 +86,7 @@ public: GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); virtual ~GraphicFilterDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -100,9 +100,9 @@ public: GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); virtual ~GraphicFilterSmooth(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } }; @@ -118,9 +118,9 @@ public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual ~GraphicFilterMosaic(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); } long GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); } bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } @@ -138,9 +138,9 @@ public: GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); virtual ~GraphicFilterSolarize(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } bool IsInvert() const { return mpCbxInvert->IsChecked(); } }; @@ -153,8 +153,8 @@ public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); virtual ~GraphicFilterSepia(); - virtual void dispose() SAL_OVERRIDE; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void dispose() override; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; sal_uInt16 GetSepiaPercent() const { return sal::static_int_cast< sal_uInt16 >(mpMtrSepia->GetValue()); @@ -169,9 +169,9 @@ public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); virtual ~GraphicFilterPoster(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) mpNumPoster->GetValue() ); } }; @@ -179,8 +179,8 @@ class EmbossControl : public SvxRectCtl { private: Link<> maModifyHdl; - virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual Size GetOptimalSize() const override; public: EmbossControl(vcl::Window* pParent) : SvxRectCtl(pParent) {} @@ -196,9 +196,9 @@ public: GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); virtual ~GraphicFilterEmboss(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; }; #endif diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index c55ac447c246..f67e51e38532 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -44,10 +44,10 @@ private: public: SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; @@ -74,16 +74,16 @@ private: DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); protected: - virtual bool Close() SAL_OVERRIDE; - virtual void Move() SAL_OVERRIDE; + virtual bool Close() override; + virtual void Move() override; void Apply(); public: SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SvxHpLinkDlg (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) override; sal_uInt16 SetPage( SvxHyperlinkItem* pItem ); void SetReadOnlyMode( bool bReadOnly ); diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 87c7e546cc6a..1a83e9097750 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -46,7 +46,7 @@ public: const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); virtual ~URLDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetURL() const { return m_pEdtURL->GetText(); } OUString GetAltText() const { return m_pEdtAlternativeText->GetText(); } diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 541d060033ad..62da72139f40 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -59,17 +59,17 @@ private: void SetLinks (); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxGeneralTabPage(); - 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_INC_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 06ffc6862e20..6a9a00aec190 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -46,10 +46,10 @@ public: SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); virtual ~SvxJSearchOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; sal_Int32 GetTransliterationFlags() const; }; 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() { diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index b1dcf0a04e0c..3ad9556d69d4 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -54,10 +54,10 @@ private: sal_Int32 nPosLineEndLb; 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(); @@ -206,22 +206,22 @@ public: SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); - 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 pLineRanges; } - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; void SetColorList( XColorListRef pColorList ) { m_pColorList = pColorList; } void SetDashList( XDashListRef pDshLst ) { m_pDashList = pDshLst; } @@ -237,8 +237,8 @@ public: void SetDashChgd( ChangeType* pIn ) { m_pnDashListState = pIn; } void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; /*************************************************************************/ @@ -307,16 +307,16 @@ private: public: SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineDefTabPage(); - 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 SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } @@ -327,7 +327,7 @@ public: void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; /*************************************************************************/ @@ -377,16 +377,16 @@ private: public: SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineEndDefTabPage(); - 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 SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } @@ -398,8 +398,8 @@ public: void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual void Resize() override; }; #endif // INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 4ee17070a5f5..24c4a6ce2666 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -34,7 +34,7 @@ public: public: FmInputRecordNoDialog(vcl::Window * pParent); virtual ~FmInputRecordNoDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 12eaceb30cfd..37ef956b6b29 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -87,13 +87,13 @@ namespace svx public: DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - 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; }; /** helper for DatabaseRegistrationDialog @@ -120,7 +120,7 @@ namespace svx public: DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr ); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index b2ae829747aa..9b5289820ba0 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -41,7 +41,7 @@ private: public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); virtual ~SvxNameDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -91,7 +91,7 @@ public: // constructor SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); virtual ~SvxObjectNameDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -123,7 +123,7 @@ public: // constructor SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); virtual ~SvxObjectTitleDescDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } void GetDescription(OUString& rDescription) {rDescription = pEdtDescription->GetText(); } @@ -145,7 +145,7 @@ private: public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ffb78dcf1f3b..27e000641e2e 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -45,11 +45,11 @@ public: SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); virtual ~SvxDistributePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet*) 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 PointChanged(vcl::Window* pWindow, RECT_POINT eRP) override; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } @@ -64,7 +64,7 @@ public: SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); virtual ~SvxDistributeDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); } SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 6449dfa7d7e1..89f13f053264 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -35,9 +35,9 @@ class SvxCropExample : public vcl::Window public: SvxCropExample( vcl::Window* pPar, WinBits nStyle ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; void SetTop( long nVal ) { aTopLeft.X() = nVal; } void SetBottom( long nVal ) { aBottomRight.X() = nVal; } @@ -93,7 +93,7 @@ class SvxGrfCropPage : public SfxTabPage SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxGrfCropPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK( ZoomHdl, MetricField * ); DECL_LINK( SizeHdl, MetricField * ); @@ -106,15 +106,15 @@ class SvxGrfCropPage : public SfxTabPage void CalcZoom(); void CalcMinMaxBorder(); void GraphicHasChanged(bool bFound); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; Size GetGrfOrigSize( const Graphic& ) const; public: 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 sfxpg DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet ) override; + virtual void Reset( const SfxItemSet *rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet *pSet ) override; }; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 0151c20358f0..da6f675d7110 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -43,9 +43,9 @@ namespace svx public: SuggestionSet( vcl::Window* pParent ); virtual ~SuggestionSet(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; void ClearSet(); }; @@ -54,7 +54,7 @@ namespace svx public: SuggestionDisplay( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionDisplay(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DisplayListBox( bool bDisplayListBox ); @@ -69,15 +69,15 @@ namespace svx OUString GetEntry( sal_uInt16 nPos ) const; OUString GetSelectEntry() const; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void Command( const CommandEvent& rCEvt ) override; DECL_LINK_TYPED( SelectSuggestionListBoxHdl, ListBox&, void ); DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void ); @@ -140,7 +140,7 @@ namespace svx vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual ~HangulHanjaConversionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ); @@ -222,7 +222,7 @@ namespace svx public: HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AddDict( const OUString& _rName, bool _bChecked ); }; @@ -241,7 +241,7 @@ namespace svx public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool GetName( OUString& _rRetName ) const; }; @@ -261,8 +261,8 @@ namespace svx public: SuggestionEdit( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionEdit(); - virtual void dispose() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void dispose() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); }; @@ -315,7 +315,7 @@ namespace svx public: HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateScrollbar(); }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index db607ac6c29f..71397b777ffd 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -31,14 +31,14 @@ private: VclPtr<SvHeaderTabListBox> maListBox; protected: DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); virtual ~MacroEventListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; SvHeaderTabListBox& GetListBox() { diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 610c861dd9f0..6c66128e1737 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -42,22 +42,22 @@ private: DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); protected: - void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; + void FillDlgFields(const OUString& rStrURL) override; void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ) SAL_OVERRIDE; + SvxLinkInsertMode& eMode ) override; public: SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkNewDocTp (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); - virtual bool AskApply () SAL_OVERRIDE; - virtual void DoApply () SAL_OVERRIDE; + virtual bool AskApply () override; + virtual void DoApply () override; - virtual void SetInitFocus() SAL_OVERRIDE; + virtual void SetInitFocus() override; }; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 6a301b62d2d0..0aea2dc4dd5a 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -57,24 +57,24 @@ private: static EPathType GetPathType ( const OUString& rStrPath ); protected: - void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; + void FillDlgFields(const OUString& rStrURL) override; void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} - virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} + SvxLinkInsertMode& eMode ) override; + virtual bool ShouldOpenMarkWnd () override {return mbMarkWndOpen;} + virtual void SetMarkWndShouldOpen (bool bOpen) override {mbMarkWndOpen=bOpen;} OUString GetCurrentURL (); public: SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkDocTp(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; + virtual void SetMarkStr ( const OUString& aStrMark ) override; - virtual void SetInitFocus() SAL_OVERRIDE; + virtual void SetInitFocus() override; }; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index e1febf0d4e9f..d964caea5334 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -69,23 +69,23 @@ private: void RefreshMarkWindow(); protected: - virtual void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; + virtual void FillDlgFields(const OUString& rStrURL) override; virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && m_pRbtLinktypInternet->IsChecked() );} - virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} + SvxLinkInsertMode& eMode ) override; + virtual bool ShouldOpenMarkWnd () override {return ( mbMarkWndOpen && m_pRbtLinktypInternet->IsChecked() );} + virtual void SetMarkWndShouldOpen (bool bOpen) override {mbMarkWndOpen=bOpen;} public: SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkInternetTp(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; + virtual void SetMarkStr ( const OUString& aStrMark ) override; - virtual void SetInitFocus() SAL_OVERRIDE; + virtual void SetInitFocus() override; }; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 857e21dd5f8d..3c128ffd6688 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -45,19 +45,19 @@ private: OUString CreateAbsoluteURL() const; protected: - virtual void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; + virtual void FillDlgFields(const OUString& rStrURL) override; virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ) SAL_OVERRIDE; + SvxLinkInsertMode& eMode ) override; public: SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkMailTp(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<IconChoicePage> Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); - virtual void SetInitFocus() SAL_OVERRIDE; + virtual void SetInitFocus() override; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 5ee6b9a3e105..184b2add43cc 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -44,15 +44,15 @@ private: public: SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxHlmarkTreeLBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { mpParentWnd = pParent; } - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual Size GetOptimalSize() const override; }; @@ -84,7 +84,7 @@ protected: void ClearTree(); int FillTree( css::uno::Reference< css::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL ); - virtual void Move () SAL_OVERRIDE; + virtual void Move () override; DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void ); DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); @@ -93,7 +93,7 @@ protected: public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); virtual ~SvxHlinkDlgMarkWnd(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool MoveTo ( Point aNewPos ); void RefreshTree(const OUString& aStrURL); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 15e840082944..c11d8afde363 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -50,13 +50,13 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper { protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Select() override; + virtual void Modify() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::File ); @@ -115,7 +115,7 @@ public: const SfxItemSet& rItemSet ); virtual ~SvxHyperlinkTabPageBase (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetDocumentFrame( const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame ) @@ -127,18 +127,18 @@ public: virtual void DoApply (); virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) override; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void ActivatePage( const SfxItemSet& rItemSet ) override; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) override; bool IsMarkWndVisible () { return static_cast<vcl::Window*>(mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); - virtual void ActivatePage() SAL_OVERRIDE; - virtual void DeactivatePage() SAL_OVERRIDE; - virtual bool QueryClose() SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual void DeactivatePage() override; + virtual bool QueryClose() override; protected: virtual bool ShouldOpenMarkWnd(); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index b515ca74f9c7..e99f0ca83843 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -37,7 +37,7 @@ public: HyphenEdit(vcl::Window* pParent); protected: - virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent &rKEvt) override; }; class SvxHyphenWordDialog : public SfxModalDialog @@ -85,7 +85,7 @@ public: css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetWindowTitle( LanguageType nLang ); void SelLeft(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index d95edc8b50f1..39cc6386fedc 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -84,7 +84,7 @@ protected: public: virtual ~IconChoicePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const SfxItemSet& GetItemSet() const { return *pSet; } @@ -108,8 +108,8 @@ public: OUString GetUserData() { return aUserString; } virtual bool QueryClose(); - void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void StateChanged( StateChangedType nType ) override; + void DataChanged( const DataChangedEvent& rDCEvt ) override; }; class IconChoiceDialog : public ModalDialog @@ -175,7 +175,7 @@ public: IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const SfxItemSet * pItemSet = 0 ); virtual ~IconChoiceDialog (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // interface SvxIconChoiceCtrlEntry* AddTabPage( @@ -198,7 +198,7 @@ public: const CancelButton& GetCancelButton() const { return *m_pCancelBtn; } CancelButton& GetCancelButton() { return *m_pCancelBtn; } - short Execute() SAL_OVERRIDE; + short Execute() override; void Start( bool bShow = true ); bool QueryClose(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 128339158496..4c2c943a3337 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -79,7 +79,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pEdFilepath->GetText(); } bool IsLinked() const { return m_pCbFilelink->IsChecked(); } - bool IsCreateNew() const SAL_OVERRIDE + bool IsCreateNew() const override { return m_pRbNewObject->IsChecked(); } public: @@ -87,11 +87,11 @@ public: const css::uno::Reference < css::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual ~SvInsertOleDlg(); - virtual void dispose() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual void dispose() override; + virtual short Execute() override; /// get replacement for the iconified embedded object and the mediatype of the replacement - css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; + css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override; }; class SvInsertPlugInDialog : public InsertObjectDialog_Impl @@ -111,8 +111,8 @@ public: SvInsertPlugInDialog(vcl::Window* pParent, const css::uno::Reference < css::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); - virtual void dispose() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual void dispose() override; + virtual short Execute() override; }; class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl @@ -147,8 +147,8 @@ public: SfxInsertFloatingFrameDialog( vcl::Window* pParent, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ); virtual ~SfxInsertFloatingFrameDialog(); - virtual void dispose() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual void dispose() override; + virtual short Execute() override; }; #endif // INCLUDED_CUI_SOURCE_INC_INSDLG_HXX diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 0e66966be946..955da7d42e9a 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -46,10 +46,10 @@ public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); virtual ~SvxInsRowColDlg(); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; - virtual bool isInsertBefore() const SAL_OVERRIDE; - virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE; + virtual bool isInsertBefore() const override; + virtual sal_uInt16 getInsertCount() const override; }; #endif diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 03edc7ba1f8c..bf9876be9139 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -76,18 +76,18 @@ private: public: SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxCaptionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet * ) override; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void FillValueSet(); }; @@ -104,7 +104,7 @@ private: Link<SvxSwFrameValidation&,void> aValidateLink; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView, diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 429cef04c823..e63e060e8048 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -91,7 +91,7 @@ class SvBaseLinksDlg : public ModalDialog public: SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index a0b06fb7d668..b406500a6c64 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -57,21 +57,21 @@ protected: public: virtual ~_SfxMacroTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AddEvent( const OUString & rEventName, sal_uInt16 nEventId ); void ScriptChanged(); - virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated (const SfxAllItemSet& aSet) override; using TabPage::ActivatePage; // FIXME WTF is this nonsense? - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) override; void LaunchFillGroup(); // --------- inherit from the base ------------- - 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; - bool IsReadOnly() const SAL_OVERRIDE; + bool IsReadOnly() const override; }; class SfxMacroTabPage : public _SfxMacroTabPage diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index f58661d7f1fd..e1ed2ce4bcc3 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -84,17 +84,17 @@ protected: public: virtual ~_SvxMacroTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InitResources(); void InitAndSetHandler( css::uno::Reference< css::container::XNameReplace > xAppEvents, css::uno::Reference< css::container::XNameReplace > xDocEvents, css::uno::Reference< css::util::XModifiable > xModifiable ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) override; void DisplayAppEvents( bool appEvents); void SetReadOnly( bool bSet ); - bool IsReadOnly() const SAL_OVERRIDE; + bool IsReadOnly() const override; }; class SvxMacroTabPage : public _SvxMacroTabPage diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 5d68a776fcbc..6e985c33c854 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -69,19 +69,19 @@ public: SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxMeasurePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } - 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 PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index f462570a4148..a39b2be037dc 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -51,7 +51,7 @@ private: public: SvxMultiPathDialog(vcl::Window* pParent); virtual ~SvxMultiPathDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetPath() const; void SetPath( const OUString& rPath ); @@ -71,7 +71,7 @@ private: public: SvxPathSelectDialog(vcl::Window* pParent); virtual ~SvxPathSelectDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetPath() const; void SetPath( const OUString& rPath ); diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 394d04265344..7ae311eeed70 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -37,10 +37,10 @@ public: SvxNewTableDialog( vcl::Window* pWindow ); virtual ~SvxNewTableDialog(); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; - virtual sal_Int32 getRows() const SAL_OVERRIDE; - virtual sal_Int32 getColumns() const SAL_OVERRIDE; + virtual sal_Int32 getRows() const override; + virtual sal_Int32 getColumns() const override; }; #endif // INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 2c204799611c..8fa538433390 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -51,9 +51,9 @@ private: void InitSettings( bool bForeground, bool bBackground ); protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER); @@ -71,16 +71,16 @@ class SvxNumberFormatTabPage : public SfxTabPage public: virtual ~SvxNumberFormatTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); // Returns area information. static const sal_uInt16* GetRanges() { return pRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override; void SetInfoItem( const SvxNumberInfoItem& rItem ); void SetNumberFormatList( const SvxNumberInfoItem& rItem ) @@ -88,8 +88,8 @@ public: void SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler ); void HideLanguage(bool bFlag=true); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void PageCreated(const SfxAllItemSet& aSet) override; private: SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 67e0445a77ab..d4199a3cf2a4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -49,7 +49,7 @@ class SvxNumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; public: SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); @@ -104,15 +104,15 @@ public: SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxSingleNumPickTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; @@ -139,18 +139,18 @@ public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; void SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;} - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #define NUM_VALUSET_COUNT 16 @@ -183,20 +183,20 @@ public: SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPickTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; void SetCharFormatNames(const OUString& rCharName, const OUString& rBulName) { sNumCharFmtName = rCharName; sBulletCharFormatName = rBulName;} - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; @@ -231,15 +231,15 @@ public: SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; @@ -341,15 +341,15 @@ public: SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) { @@ -360,7 +360,7 @@ public: ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;} void SetModified(bool bRepaint = true); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; /** Get the numberings provided by the i18n framework (CTL, Asian, ...) and add them to the listbox. Extended numbering schemes present in the @@ -446,19 +446,19 @@ public: SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); void SetModified(bool bRepaint = true); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #endif diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index d88d65927453..5d5189f0e74a 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -55,12 +55,12 @@ class SvxAsianLayoutPage : public SfxTabPage public: SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxAsianLayoutPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); - 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/inc/optdict.hxx b/cui/source/inc/optdict.hxx index d909e8417ca6..d64d80b82dd0 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -67,7 +67,7 @@ public: css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ); virtual ~SvxNewDictionaryDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Reference< css::linguistic2::XDictionary > @@ -93,7 +93,7 @@ class SvxDictEdit : public Edit void SetSpaces(bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) override; }; // class SvxEditDictionaryDialog ----------------------------------------- @@ -153,7 +153,7 @@ public: css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl ); virtual ~SvxEditDictionaryDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 906ea8c9f33d..3653b927d837 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -87,7 +87,7 @@ class SvxEditModulesDlg : public ModalDialog public: SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData); virtual ~SvxEditModulesDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; // class SvxLinguTabPage ------------------------------------------------- @@ -150,11 +150,11 @@ private: public: virtual ~SvxLinguTabPage(); - 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 bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; void HideGroups( sal_uInt16 nGrp ); }; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 26801c1b1581..8671e3f02e17 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -71,13 +71,13 @@ private: public: SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxPathTabPage(); - 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/inc/page.hxx b/cui/source/inc/page.hxx index 0c5b225301dc..3da4a8955114 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -185,27 +185,27 @@ private: void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } 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* rSet ); // returns the range of the Which values static const sal_uInt16* GetRanges() { return pRanges; } - virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void FillUserData() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void FillUserData() override; virtual ~SvxPageDescPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetMode( SvxModeType eMType ) { eMode = eMType; } void SetPaperFormatRanges( Paper eStart, Paper eEnd ) { ePaperStart = eStart, ePaperEnd = eEnd; } void SetCollectionList(const std::vector<OUString> &aList); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #endif // INCLUDED_CUI_SOURCE_INC_PAGE_HXX diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index b4b401ea0420..f71e9f4010d6 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -95,21 +95,21 @@ private: DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; public: virtual ~SvxStdParagraphTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED(ELRLoseFocusHdl, Control&, void); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void SetPageWidth( sal_uInt16 nPageWidth ); @@ -119,7 +119,7 @@ public: void EnableAutoFirstLine(); void EnableAbsLineDist(long nMinTwip); void EnableNegativeMode(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; // class SvxParaAlignTabPage ------------------------------------------------ @@ -162,21 +162,21 @@ class SvxParaAlignTabPage : public SfxTabPage SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; public: virtual ~SvxParaAlignTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pAlignRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void EnableJustifyExt(); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; // class SvxExtParagraphTabPage ------------------------------------------ @@ -201,20 +201,20 @@ class SvxExtParagraphTabPage: public SfxTabPage public: virtual ~SvxExtParagraphTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pExtRanges; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void DisablePageBreak(); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -265,7 +265,7 @@ private: DECL_LINK_TYPED( PageBreakPosHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( PageBreakTypeHdl_Impl, ListBox&, void ); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; @@ -283,15 +283,15 @@ class SvxAsianTabPage : public SfxTabPage public: virtual ~SvxAsianTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; }; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 75a9f9566104..b0082525273e 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -40,7 +40,7 @@ public: sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // AbstractPasswordToOpenModifyDialog OUString GetPasswordToOpen() const; diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 3d5aa611232e..e6c2a1eccb42 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -56,7 +56,7 @@ class SvPasteObjectDialog : public ModalDialog public: SvPasteObjectDialog( vcl::Window* pParent ); virtual ~SvPasteObjectDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ); void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index d367676dd20d..e84a548f2415 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -46,7 +46,7 @@ public: SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false); virtual ~SvxPostItDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static const sal_uInt16* GetRanges(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 7c31f340be54..e93dc7b0b2a8 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -33,9 +33,9 @@ private: Point m_aCurMousePoint; protected: - virtual void SetTabs() SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& _rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void SetTabs() override; + virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; public: SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 1d77c270571a..e46ade518e2a 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -62,9 +62,9 @@ private: static css::uno::Reference< css::uno::XInterface > getDocumentModel( css::uno::Reference< css::uno::XComponentContext >& xCtx, OUString& docName ); protected: - virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - virtual void ExpandedHdl() SAL_OVERRIDE; - virtual bool ExpandingHdl() SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry* pParent ) override; + virtual void ExpandedHdl() override; + virtual bool ExpandingHdl() override; public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, @@ -72,7 +72,7 @@ public: css::uno::Reference< css::frame::XModel>& model ); SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, @@ -100,7 +100,7 @@ private: public: CuiInputDialog(vcl::Window * pParent, InputDialogMode nMode); virtual ~CuiInputDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -177,9 +177,9 @@ public: // to specify the language or provider SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); virtual ~SvxScriptOrgDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; @@ -197,7 +197,7 @@ public: virtual ~SvxScriptErrorDialog(); - short Execute() SAL_OVERRIDE; + short Execute() override; }; #endif // INCLUDED_CUI_SOURCE_INC_SCRIPTDLG_HXX diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 08805058dbb8..f5939979b96d 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -41,7 +41,7 @@ private: public: SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; }; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 0ae958b60fe3..f78523cef916 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -91,12 +91,12 @@ friend class SvxConfigGroupListBox; SvTreeListEntry* m_pDraggingEntry; DECL_LINK_TYPED(TimerHdl, Timer *, void); - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; public: SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigFunctionListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ClearAll(); OUString GetHelpText( SvTreeListEntry *pEntry ); using Window::GetHelpText; @@ -104,12 +104,12 @@ public: void FunctionSelected(); // drag n drop methods - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvTreeListEntry* ) SAL_OVERRIDE; + TransferDataContainer&, SvTreeListEntry* ) override; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) override; }; class SvxConfigGroupListBox : public SvTreeListBox @@ -151,13 +151,13 @@ private: ); protected: - virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry *pEntry) override; + virtual bool Expand( SvTreeListEntry* pParent ) override; public: SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigGroupListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Init(bool bShowSlots, const css::uno::Reference < css::frame::XFrame >& xFrame); @@ -198,7 +198,7 @@ public: const css::uno::Reference< css::frame::XFrame >& xFrame = 0 ); virtual ~SvxScriptSelectorDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAddHdl( const Link<SvxScriptSelectorDialog&,void>& rLink ) { m_aAddHdl = rLink; } const Link<SvxScriptSelectorDialog&,void>& GetAddHdl() const { return m_aAddHdl; } diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 77f6d5023ab5..c1cfc172d690 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -43,7 +43,7 @@ class FmShowColsDialog : public ModalDialog public: FmShowColsDialog(vcl::Window* pParent); virtual ~FmShowColsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 047feae4b315..b2a2d2fcb202 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -43,11 +43,11 @@ public: DECL_LINK_TYPED( ClickHdl, Button *, void ); - virtual bool IsHorizontal() const SAL_OVERRIDE; - virtual bool IsProportional() const SAL_OVERRIDE; - virtual long GetCount() const SAL_OVERRIDE; + virtual bool IsHorizontal() const override; + virtual bool IsProportional() const override; + virtual long GetCount() const override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; #endif diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 87a3eeeb4370..e2e0f36913cf 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -31,10 +31,10 @@ class SvxSearchFormatDialog : public SfxTabDialog public: SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchFormatDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; private: FontList* m_pFontList; @@ -52,7 +52,7 @@ public: SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); virtual ~SvxSearchAttributeDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<SvxCheckListBox> m_pAttrLB; @@ -80,7 +80,7 @@ public: sal_uInt16 nShorter, sal_uInt16 nLonger ); virtual ~SvxSearchSimilarityDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } sal_uInt16 GetShorter() { return (sal_uInt16)m_pShorterFld->GetValue(); } diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 7635ec68dc31..12c686519a81 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -127,15 +127,15 @@ class SvxSwPosSizeTabPage : public SfxTabPage public: SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxSwPosSizeTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); - 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 sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; void EnableAnchorTypes(sal_uInt16 nAnchorEnable); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 455caa2777ef..efecaa65d6a6 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -51,17 +51,17 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } - 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; void DisableControls( const sal_uInt16 nFlag ); protected: - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -119,7 +119,7 @@ private: DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #endif // INCLUDED_CUI_SOURCE_INC_TABSTPGE_HXX diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 725ef2f755e1..c76c39d93a3d 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -77,13 +77,13 @@ private: public: SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet * ) override; }; /************************************************************************* @@ -98,7 +98,7 @@ class SvxTextTabDialog : public SfxTabDialog private: const SdrView* pView; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index c232882889c4..7d67d86d76ae 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -78,19 +78,19 @@ public: SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAttrPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } - 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 PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) override; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; #endif // INCLUDED_CUI_SOURCE_INC_TEXTATTR_HXX diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a80177783dd3..78146c30bd43 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -43,14 +43,14 @@ class LookUpComboBox : public ComboBox public: LookUpComboBox(vcl::Window *pParent); virtual ~LookUpComboBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( ModifyTimer_Hdl, Idle *, void ); void init(SvxThesaurusDialog *pDialog); // ComboBox - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; }; class AlternativesExtraData @@ -86,7 +86,7 @@ public: void init(SvxThesaurusDialog *pDialog); virtual ~ThesaurusAlternativesCtrl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvTreeListEntry * AddEntry( sal_Int32 nVal, const OUString &rText, bool bIsHeader ); @@ -94,8 +94,8 @@ public: void SetExtraData( const SvTreeListEntry *pEntry, const AlternativesExtraData &rData ); AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry ); - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; }; class ReplaceEdit : public Edit @@ -108,14 +108,14 @@ class ReplaceEdit : public Edit public: ReplaceEdit(vcl::Window *pParent); virtual ~ReplaceEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void init(Button *pBtn) { m_pBtn = pBtn; } // Edit - virtual void Modify() SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; + virtual void Modify() override; + virtual void SetText( const OUString& rStr ) override; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override; }; class SvxThesaurusDialog : public SvxStandardDialog @@ -136,7 +136,7 @@ class SvxThesaurusDialog : public SvxStandardDialog public: virtual ~SvxThesaurusDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool WordFound() const { return m_bWordFound; } OUString getErrStr() const { return m_aErrStr; } @@ -157,7 +157,7 @@ public: bool UpdateAlternativesBox_Impl(); void LookUp( const OUString &rText ); void LookUp_Impl(); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SvxThesaurusDialog( vcl::Window* pParent, diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index c1282808200c..e5892be1c21f 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -56,7 +56,7 @@ private: sal_uInt16 nAnchorCtrls; Link<SvxSwFrameValidation&,void> aValidateLink; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: @@ -145,23 +145,23 @@ private: public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxPositionSizeTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } - 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 Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; void DisableResize(); void DisableProtect(); @@ -203,18 +203,18 @@ private: public: SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxAngleTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } - 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 Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -250,18 +250,18 @@ private: public: SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxSlantTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } - 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 Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 4b4004f49b16..5c481423e229 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -184,8 +184,8 @@ protected: DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual short Execute() override; public: OfaTreeOptionsDialog( vcl::Window* pParent, @@ -193,7 +193,7 @@ public: bool bActivateLastSelection = true ); OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup ); sal_uInt16 AddGroup( const OUString& rGroupName, SfxShell* pCreateShell, @@ -271,10 +271,10 @@ public: css::awt::XContainerWindowProvider >& rProvider ); virtual ~ExtensionsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage() SAL_OVERRIDE; - virtual void DeactivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual void DeactivatePage() override; void ResetPage(); void SavePage(); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index dcd7c41c81a4..818d381c0a10 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -58,7 +58,7 @@ private: public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~SvxZoomDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const SfxItemSet* GetOutputItemSet() const; 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; }; 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; } |