diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /cui/source/factory/dlgfact.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cui/source/factory/dlgfact.hxx')
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 382 |
1 files changed, 191 insertions, 191 deletions
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 |