diff options
Diffstat (limited to 'sw/source/uibase/inc')
132 files changed, 816 insertions, 816 deletions
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index 42367941edf9..07d9a0e1bb8b 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; }; #endif diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index a0f9ea850467..90138b4ded87 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -44,12 +44,12 @@ class DropDownFieldDialog : public SvxStandardDialog SwDropDownField* pDropField; DECL_LINK_TYPED(ButtonHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); virtual ~DropDownFieldDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } //namespace sw diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index d0fc11e435ac..789345253c14 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -55,13 +55,13 @@ class SwFrameMenuButtonBase : public MenuButton, public ISwFrameControl protected: virtual ~SwFrameMenuButtonBase() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrm* pFrm ); - virtual const SwFrm* GetFrame() SAL_OVERRIDE { return m_pFrm; } - virtual SwEditWin* GetEditWin() SAL_OVERRIDE { return m_pEditWin; } + virtual const SwFrm* GetFrame() override { return m_pFrm; } + virtual SwEditWin* GetEditWin() override { return m_pEditWin; } const SwPageFrm* GetPageFrame(); }; diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index a96423f3f021..b110421a6d38 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -31,23 +31,23 @@ class SwHeaderFooterWin : public SwFrameMenuButtonBase public: SwHeaderFooterWin( SwEditWin *pEditWin, const SwFrm *pFrm, bool bHeader ); virtual ~SwHeaderFooterWin( ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Select( ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Select( ) override; - virtual void ShowAll( bool bShow ) SAL_OVERRIDE; - virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; + virtual void ShowAll( bool bShow ) override; + virtual bool Contains( const Point &rDocPt ) const override; bool IsHeader() { return m_bIsHeader; }; bool IsEmptyHeaderFooter( ); void ExecuteCommand(sal_uInt16 nSlot); - void SetReadonly( bool bReadonly ) SAL_OVERRIDE; + void SetReadonly( bool bReadonly ) override; private: DECL_LINK_TYPED( FadeHandler, Timer *, void ); diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 34d1b4c83f5d..23a3a134a0c7 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -35,19 +35,19 @@ class SwPageBreakWin : public SwFrameMenuButtonBase public: SwPageBreakWin( SwEditWin* pEditWin, const SwFrm *pFrm ); virtual ~SwPageBreakWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Select( ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Activate( ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void Select( ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Activate( ) override; void UpdatePosition( const Point* pEvtPt = NULL ); - virtual void ShowAll( bool bShow ) SAL_OVERRIDE; - virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; + virtual void ShowAll( bool bShow ) override; + virtual bool Contains( const Point &rDocPt ) const override; - void SetReadonly( bool bReadonly ) SAL_OVERRIDE; + void SetReadonly( bool bReadonly ) override; void Fade( bool bFadeIn ); diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index 462bca68d334..e9795fdd673b 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -38,15 +38,15 @@ class SwSpellDialogChildWindow void LockFocusNotification(bool bLock); protected: - virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) SAL_OVERRIDE; - virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; - virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) SAL_OVERRIDE; - virtual bool HasAutoCorrection() SAL_OVERRIDE; - virtual bool HasGrammarChecking() SAL_OVERRIDE; - virtual bool IsGrammarChecking() SAL_OVERRIDE; - virtual void SetGrammarChecking(bool bOn) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) override; + virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) override; + virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) override; + virtual bool HasAutoCorrection() override; + virtual bool HasGrammarChecking() override; + virtual bool IsGrammarChecking() override; + virtual void SetGrammarChecking(bool bOn) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; public: SwSpellDialogChildWindow ( diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index 5a51d05dd340..1e15c274b8dc 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -53,39 +53,39 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 0c12d35e1812..c97826a4a381 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -31,7 +31,7 @@ class SwInsertAbstractDlg : public SfxModalDialog public: SwInsertAbstractDlg( vcl::Window* pParent ); virtual ~SwInsertAbstractDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt8 GetLevel() const; sal_uInt8 GetPara() const; diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index aab03f4b5ba4..7a24e98273ba 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -29,7 +29,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField protected: void Action(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; public: NumEditAction( vcl::Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} @@ -46,7 +46,7 @@ public: : Edit(pParent, nStyle) { } - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; void SetReturnActionLink(const Link<ReturnActionEdit&,void>& rLink) { aReturnActionLink = rLink;} diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx index e66a632fc09b..23c31e68b293 100644 --- a/sw/source/uibase/inc/annotsh.hxx +++ b/sw/source/uibase/inc/annotsh.hxx @@ -71,7 +71,7 @@ public: void StateSearch(SfxItemSet &); virtual ::svl::IUndoManager* - GetUndoManager() SAL_OVERRIDE; + GetUndoManager() override; static SfxItemPool* GetAnnotationPool(SwView& rV); }; diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 115e2eaf8ae5..f1319b0783de 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -53,7 +53,7 @@ public: SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillOptions( SwAsciiOptions& rOptions ); }; diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx index 421236967b74..ccfde8c46d85 100644 --- a/sw/source/uibase/inc/autoedit.hxx +++ b/sw/source/uibase/inc/autoedit.hxx @@ -27,7 +27,7 @@ public: AutoEdit( vcl::Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: - virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rEvent ) override; }; // Implementation in autocorr.cxx diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx index 50b561f9576e..db8bb316cfd6 100644 --- a/sw/source/uibase/inc/barcfg.hxx +++ b/sw/source/uibase/inc/barcfg.hxx @@ -26,13 +26,13 @@ class SwToolbarConfigItem : public utl::ConfigItem static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwToolbarConfigItem( bool bWeb ); virtual ~SwToolbarConfigItem(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); }; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index c1f80e8e2af9..442147a745e0 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -36,9 +36,9 @@ private: bool bGraphic : 1; bool bLeftAlign : 1; - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; public: BmpWindow(vcl::Window* pPar, WinBits nStyle); diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index 8d73b0cfcb6d..7ec842f29692 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -24,12 +24,12 @@ class SwBookmarkControl : public SfxStatusBarControl { - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index d350197882d6..7bd11cc8d7a1 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox sal_Int32 GetNextSelEntryPos(sal_Int32 nPos) const; sal_Int32 GetSelEntryPos(sal_Int32 nPos) const; - virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt) override; public: BookmarkCombo(vcl::Window* pWin, WinBits nStyle); @@ -58,12 +58,12 @@ class SwInsertBookmarkDlg: public SvxStandardDialog DECL_LINK(ModifyHdl, BookmarkCombo *); DECL_LINK_TYPED(DeleteHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwInsertBookmarkDlg(vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); virtual ~SwInsertBookmarkDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index c37612cdb62d..9bf6bfd340af 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -60,12 +60,12 @@ class SwBreakDlg: public SvxStandardDialog void CheckEnable(); protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwBreakDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwBreakDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetTemplateName() { return aTemplate; } sal_uInt16 GetKind() { return nKind; } diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index efa8758a15b0..e6c9793501c7 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -64,8 +64,8 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - 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 operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -95,8 +95,8 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - 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 operator=( const SwElemItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -117,9 +117,9 @@ public: SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; const OUString &GetFax() const { return sFaxName; } }; @@ -135,8 +135,8 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - 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 operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -173,8 +173,8 @@ public: SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); - 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; }; #endif diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 2935e5bd8b8e..aef9bc08ca1b 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -50,7 +50,7 @@ class SwChangeDBDlg: public SvxStandardDialog DECL_LINK_TYPED(ButtonHdl, Button*, void); DECL_LINK_TYPED(AddDBHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void UpdateFields(); void FillDBPopup(); SvTreeListEntry* Insert(const OUString& rDBName); @@ -59,7 +59,7 @@ class SwChangeDBDlg: public SvxStandardDialog public: SwChangeDBDlg(SwView& rVw); virtual ~SwChangeDBDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 8da147d50546..4de3e0a4e913 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -54,7 +54,7 @@ public: virtual ~SwCharDlg(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; }; class SwCharURLPage : public SfxTabPage @@ -82,12 +82,12 @@ public: const SfxItemSet& rSet ); virtual ~SwCharURLPage(); - 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/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index f15e80bf2aae..3e5f122ec2fa 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -52,7 +52,7 @@ protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, - const bool bEnabled) SAL_OVERRIDE; + const bool bEnabled) override; public: SwPageGridExample(vcl::Window* pPar) : SwPageExample(pPar) @@ -60,7 +60,7 @@ public: {} virtual ~SwPageGridExample(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateExample( const SfxItemSet& rSet ); }; @@ -74,7 +74,7 @@ protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, - const bool bEnabled) SAL_OVERRIDE; + const bool bEnabled) override; public: SwColExample(vcl::Window* pPar) @@ -99,14 +99,14 @@ private: SwFormatCol m_aCols; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; public: SwColumnOnlyExample(vcl::Window*); void SetColumns(const SwFormatCol& rCol); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index ce9c606dce1a..28298d8d8c7e 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -67,7 +67,7 @@ class SwColumnDlg : public SfxModalDialog public: SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class ColumnValueSet : public ValueSet @@ -81,8 +81,8 @@ public: : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; // column dialog now as TabPage @@ -160,8 +160,8 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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 connectPercentField(PercentField &rWrap, const OString &rName); @@ -172,13 +172,13 @@ class SwColumnPage : public SfxTabPage public: SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwColumnPage(); - 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 aPageRg; } - 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 SetFrmMode(bool bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx index ca63894afb54..66825df81b29 100644 --- a/sw/source/uibase/inc/conarc.hxx +++ b/sw/source/uibase/inc/conarc.hxx @@ -31,11 +31,11 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void Deactivate() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx index f082cc46c373..d49565d196ba 100644 --- a/sw/source/uibase/inc/concustomshape.hxx +++ b/sw/source/uibase/inc/concustomshape.hxx @@ -39,18 +39,18 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function OUString GetShapeType() const; static OUString GetShapeTypeFromRequest( SfxRequest& rReq ); - virtual void CreateDefaultObject() SAL_OVERRIDE; + virtual void CreateDefaultObject() override; // #i33136# - virtual bool doConstructOrthogonal() const SAL_OVERRIDE; + virtual bool doConstructOrthogonal() const override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index a188f1256856..b21f1087d1a0 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { bool bBrackets, bEnableDrop; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; public: ConditionEdit(vcl::Window* pParent, WinBits nStyle); diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx index bd116ebe83a3..65e01caf98ce 100644 --- a/sw/source/uibase/inc/conform.hxx +++ b/sw/source/uibase/inc/conform.hxx @@ -27,10 +27,10 @@ public: ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function - virtual void CreateDefaultObject() SAL_OVERRIDE; + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void CreateDefaultObject() override; }; #endif diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx index ceabd6fd4b94..f3276e3a2fef 100644 --- a/sw/source/uibase/inc/conpoly.hxx +++ b/sw/source/uibase/inc/conpoly.hxx @@ -30,11 +30,11 @@ public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index c79753ad16b9..878d99c8031e 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -34,10 +34,10 @@ class ConstRectangle : public SwDrawBase ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index 10cfa93bcb80..07cd57b3588d 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -82,7 +82,7 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual bool IsProtect() const SAL_OVERRIDE; + virtual bool IsProtect() const override; const OUString& GetURL() const { return sURL; } const SwTextINetFormat* GetINetAttr() { return pINetAttr; } }; @@ -114,7 +114,7 @@ public: const SwFormatField* GetPostIt() const { return pField; } SwRangeRedline* GetRedline() { return pRedline; } - virtual bool IsProtect() const SAL_OVERRIDE; + virtual bool IsProtect() const override; bool IsPostIt() const {return mbPostIt; } }; diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 4dd8bdca4737..7b9a2afdad98 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -107,52 +107,52 @@ class SwContentTree using SvTreeListBox::EditEntry; protected: - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; SwNavigationPI* GetParentWindow(); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual void DragFinished( sal_Int8 ) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; void EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; public: SwContentTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwContentTree(); - virtual void dispose() SAL_OVERRIDE; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + virtual void dispose() override; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const override; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const override; SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); bool ToggleToRoot(); @@ -175,9 +175,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual bool Expand( SvTreeListEntry* pParent ) override; - virtual bool Collapse( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual bool Collapse( SvTreeListEntry* pParent ) override; void ExecCommand(sal_uInt16 nCmd, bool bModifier); @@ -194,15 +194,15 @@ public: DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( TimerUpdate, Timer *, void ); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; - virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; + virtual void RequestingChildren( SvTreeListEntry* pParent ) override; + virtual void GetFocus() override; + virtual void KeyInput(const KeyEvent& rKEvt) override; - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) override; using Control::Notify; // FIXME why do we have 2 of these - virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override; }; @@ -218,7 +218,7 @@ public: } 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; }; namespace sfx2 { class DocumentInserter; } @@ -258,38 +258,38 @@ private: protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual void DragFinished( sal_Int8 ) override; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void SelectHdl() SAL_OVERRIDE; - virtual void DeselectHdl() SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void GetFocus() override; + virtual void SelectHdl() override; + virtual void DeselectHdl() override; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; void Clear(); @@ -307,13 +307,13 @@ protected: static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK_TYPED(SwGlobalTree, ShowFrameHdl, void*, void); - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; public: SwGlobalTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); void InsertRegion( const SwGlblDocContent* pCont, diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index aa57f2360343..8609c30a003f 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -63,7 +63,7 @@ class SwConvertTableDlg: public SfxModalDialog public: SwConvertTableDlg( SwView& rView, bool bToTable ); virtual ~SwConvertTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetValues( sal_Unicode& rDelim, SwInsertTableOptions& rInsTableOpts, diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index b4a5a9b28380..371faa4defe2 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -58,7 +58,7 @@ public: : m_sNone(rNone) { } - virtual OUString filter(const OUString &rText) SAL_OVERRIDE; + virtual OUString filter(const OUString &rText) override; }; class SwCaptionDialog : public SvxStandardDialog @@ -100,7 +100,7 @@ class SwCaptionDialog : public SvxStandardDialog DECL_LINK_TYPED(OptionHdl, Button *, void); DECL_LINK_TYPED(CaptionHdl, Button *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void DrawSample(); void ApplyCaptionOrder(); //#i61007# order of captions @@ -109,7 +109,7 @@ class SwCaptionDialog : public SvxStandardDialog public: SwCaptionDialog( vcl::Window *pParent, SwView &rV ); virtual ~SwCaptionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx index 55251ee4de3a..e67382dbf38f 100644 --- a/sw/source/uibase/inc/dbconfig.hxx +++ b/sw/source/uibase/inc/dbconfig.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem { private: SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; SwDBData* pAdrImpl; SwDBData* pBibImpl; @@ -40,7 +40,7 @@ public: void Load(); const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 833d8670e983..2bf535ef4dc1 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -147,8 +147,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void ImplCommit() override; void Load(); // set the tables - properties @@ -161,7 +161,7 @@ public: const SwDBData& rData ); virtual ~SwInsertDBColAutoPilot(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index 46a02241d666..1e6f69adbb63 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -44,18 +44,18 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox DECL_DLLPRIVATE_LINK_TYPED( DBCompare, const SvSortData&, sal_Int32 ); SAL_DLLPRIVATE void InitTreeList(); - SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) override; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; using SvTreeListBox::Select; public: SwDBTreeList(vcl::Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); - virtual void dispose() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void dispose() override; + virtual Size GetOptimalSize() const override; OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index d6d81ba9d3e8..80dc4c47f2af 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -38,7 +38,7 @@ protected: public: virtual ~CancelableDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetCancelHdl( const Link<Button*,void>& rLink ); void Show(); @@ -60,7 +60,7 @@ public: PrintMonitor( vcl::Window *pParent, bool modal, PrintMonitorType eType ); virtual ~PrintMonitor(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class CreateMonitor : public CancelableDialog @@ -68,7 +68,7 @@ class CreateMonitor : public CancelableDialog public: CreateMonitor( vcl::Window *pParent, bool modal ); virtual ~CreateMonitor(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTotalCount( sal_Int32 nTotal ); void SetCurrentPosition( sal_Int32 nCurrent ); diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 9c87e66af780..3a66f8bc4637 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -31,7 +31,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog sal_uInt16 m_nFootNoteId; sal_uInt16 m_nEndNoteId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; DECL_LINK_TYPED( OkHdl, Button *, void ); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 8cd7251e9ef2..abfee6d91d24 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -32,13 +32,13 @@ class SwDocStatPage: public SfxTabPage public: SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); protected: - 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; DECL_LINK_TYPED(UpdateHdl, Button*, void); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index c251c7ba0c51..4aee03283fac 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -66,7 +66,7 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); DECL_LINK_TYPED(ClickHdl, Button*, void); @@ -82,14 +82,14 @@ friend class SwDropCapsPict; public: SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage(); - 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 aPageRg; } - 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 SetFormat(bool bSet){bFormat = bSet;} }; diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx index a4e2ff6a608a..98e5757c9a9d 100644 --- a/sw/source/uibase/inc/drwtxtsh.hxx +++ b/sw/source/uibase/inc/drwtxtsh.hxx @@ -54,7 +54,7 @@ public: virtual ~SwDrawTextShell(); virtual ::svl::IUndoManager* - GetUndoManager() SAL_OVERRIDE; + GetUndoManager() override; static void StateDisableItems(SfxItemSet &); diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx index 49bd1fd0af70..c3996640bc41 100644 --- a/sw/source/uibase/inc/dselect.hxx +++ b/sw/source/uibase/inc/dselect.hxx @@ -28,9 +28,9 @@ class DrawSelection : public SwDrawBase DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // mouse- & key events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 9263e84a6bf4..fda3911a3c96 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -185,27 +185,27 @@ friend void PageNumNotify( SwViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - virtual void PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) override; + virtual void PrePaint(vcl::RenderContext& rRenderContext) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() 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 RequestHelp(const HelpEvent& rEvt) 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 RequestHelp(const HelpEvent& rEvt) override; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; // Drag & Drop Interface - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; - virtual OUString GetSurroundingText() const SAL_OVERRIDE; - virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual OUString GetSurroundingText() const override; + virtual Selection GetSurroundingTextSelection() const override; void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, bool bFromIME = false ); @@ -216,7 +216,7 @@ protected: bool IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& rControl, bool& bOverFly, bool& bPageAnchored ) const; public: - virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent &rKEvt) override; void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); bool IsDrawSelMode(); @@ -263,7 +263,7 @@ public: const SwView &GetView() const { return m_rView; } SwView &GetView() { return m_rView; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; static inline long GetDDStartPosX() { return m_nDDStartPosX; } static inline long GetDDStartPosY() { return m_nDDStartPosY; } @@ -293,10 +293,10 @@ public: SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) SAL_OVERRIDE; + void LogicInvalidate(const Rectangle* pRectangle) override; /// Same as MouseButtonDown(), but coordinates are in logic unit. void LogicMouseButtonDown(const MouseEvent& rMouseEvent); /// Same as MouseButtonUp(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index 49faf2339110..9fea992adb2d 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -60,11 +60,11 @@ public: SwEnvItem& operator =(const SwEnvItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; class SwEnvCfgItem : public utl::ConfigItem @@ -74,7 +74,7 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwEnvCfgItem(); @@ -82,7 +82,7 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index cce27158fc39..b8ab936ce842 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -42,15 +42,15 @@ class Printer; class SwEnvPreview : public vcl::Window { - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; public: SwEnvPreview(vcl::Window * pParent, WinBits nStyle); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; }; class SwEnvDlg : public SfxTabDialog @@ -67,13 +67,13 @@ friend class SwEnvPreview; SfxItemSet *pSenderSet; sal_uInt16 m_nEnvPrintId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; public: SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwEnvPage : public SfxTabPage @@ -104,15 +104,15 @@ class SwEnvPage : public SfxTabPage public: SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - 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; void FillItem(SwEnvItem& rItem); - 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/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 04bc3dab649f..72688b99c9c3 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -43,11 +43,11 @@ public: SwFieldEditDlg(SwView& rVw); virtual ~SwFieldEditDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED(OKHdl, Button*, void); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void EnableInsert(bool bEnable); void InsertHdl(); diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index 3f89dc6a8cee..12b797d8c7aa 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -38,10 +38,10 @@ class SwFieldDlg: public SfxTabDialog sal_uInt16 m_nFuncId; sal_uInt16 m_nDbId; - virtual bool Close() SAL_OVERRIDE; - virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void Activate() SAL_OVERRIDE; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual bool Close() override; + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) override; + virtual void Activate() override; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; void ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate = false ); diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index 89b70f36c54d..d7abe750b8e6 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -31,7 +31,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID(SwFieldDlgWrapper); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; void ShowReferencePage(); }; @@ -45,7 +45,7 @@ public: SFX_DECL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; }; #endif diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx index 77aa2a669d97..e9f47ebfd31f 100644 --- a/sw/source/uibase/inc/fontcfg.hxx +++ b/sw/source/uibase/inc/fontcfg.hxx @@ -71,13 +71,13 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight ); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwStdFontConfig(); virtual ~SwStdFontConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 1e938e22b925..cd74b450d46a 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -37,7 +37,7 @@ class SwForm; // insert marker for index entry class SwIdxFormDlg : public SvxStandardDialog { - void Apply() SAL_OVERRIDE; + void Apply() override; VclPtr<ListBox> aEntryLB; VclPtr<OKButton> aOKBtn; @@ -65,7 +65,7 @@ class SwIdxFormDlg : public SvxStandardDialog public: SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index ab5977b9a869..8b95826a1b98 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -47,7 +47,7 @@ class SwFrmDlg : public SfxTabDialog sal_uInt16 m_nMacroId; sal_uInt16 m_nBorderId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwFrmDlg( SfxViewFrame *pFrame, vcl::Window *pParent, diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index d83af39b4bae..b29b2b32ce3e 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -127,8 +127,8 @@ class SwFrmPage: public SfxTabPage bool m_bIsMathOLE; bool m_bIsMathBaselineAlignment; - 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; DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); @@ -186,13 +186,13 @@ class SwFrmPage: public SfxTabPage public: SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmPage(); - 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 aPageRg; } - 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 SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(bool bFormat); @@ -226,9 +226,9 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK_TYPED(MirrorHdl, Button*, void); DECL_LINK_TYPED(BrowseHdl, Button*, void); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; virtual ~SwGrfExtPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -238,9 +238,9 @@ 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; }; class SwFrmURLPage : public SfxTabPage @@ -263,12 +263,12 @@ class SwFrmURLPage : public SfxTabPage public: SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmURLPage(); - 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; }; class SwFrmAddPage : public SfxTabPage @@ -312,13 +312,13 @@ class SwFrmAddPage : public SfxTabPage public: SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmAddPage(); - 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 aAddPgRg; } - 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 SetFormatUsed(bool bFormat); void SetFrmType(const OUString &rType) { sDlgType = rType; } diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 78e80933de90..1b14ae803b38 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -47,7 +47,7 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) override; }; struct GlosBibUserData @@ -65,7 +65,7 @@ public: { } - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; class SwGlossaryGroupDlg : public SvxStandardDialog @@ -90,7 +90,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog bool IsDeleteAllowed(const OUString &rGroup); protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED(NewHdl, Button *, void); DECL_LINK_TYPED( DeleteHdl, Button*, void ); @@ -103,7 +103,7 @@ public: std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const OUString& GetCreatedGroupName() const {return sCreatedGroup;} }; diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index c5ae2bff1c08..ff440f13050e 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -70,7 +70,7 @@ public: void Update(); - virtual void Invoke() SAL_OVERRIDE; + virtual void Invoke() override; void ClearGroups(); }; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index e7ad2c5c9920..4092f98be3e8 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -58,18 +58,18 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos) SAL_OVERRIDE; + sal_uLong& rNewChildPos) override; TriState NotifyCopyingOrMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -77,8 +77,8 @@ class SwGlTreeListBox : public SvTreeListBox public: SwGlTreeListBox(vcl::Window* pParent, WinBits nBits); - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual Size GetOptimalSize() const override; void Clear(); }; @@ -135,7 +135,7 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK_TYPED( PreviewLoadedHdl, SwOneExampleFrame&, void ); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); void ShowAutoText(const OUString& rGroup, const OUString& rShortName); @@ -149,7 +149,7 @@ class SwGlossaryDlg : public SvxStandardDialog public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); virtual ~SwGlossaryDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetCurrGrpName() const; OUString GetCurrShortName() const { diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx index 17ac5fdcb1bf..6722ec79f5b3 100644 --- a/sw/source/uibase/inc/glshell.hxx +++ b/sw/source/uibase/inc/glshell.hxx @@ -27,7 +27,7 @@ class SwGlosDocShell : public SwDocShell OUString aGroupName; protected: - virtual bool Save() SAL_OVERRIDE; + virtual bool Save() override; public: TYPEINFO_OVERRIDE(); @@ -58,7 +58,7 @@ class SwWebGlosDocShell : public SwWebDocShell OUString aGroupName; protected: - virtual bool Save() SAL_OVERRIDE; + virtual bool Save() override; public: TYPEINFO_OVERRIDE(); diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 4226ed89adad..5af24755d0d8 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -38,11 +38,11 @@ private: bool bInfoBox : 1; // display info-box when ending protected: - virtual void SpellStart( SvxSpellArea eSpell ) SAL_OVERRIDE; - virtual bool SpellContinue() SAL_OVERRIDE; - virtual void SpellEnd( ) SAL_OVERRIDE; - virtual bool SpellMore() SAL_OVERRIDE; - virtual void InsertHyphen( const sal_Int32 nPos ) SAL_OVERRIDE; // insert hyphen + virtual void SpellStart( SvxSpellArea eSpell ) override; + virtual bool SpellContinue() override; + virtual void SpellEnd( ) override; + virtual bool SpellMore() override; + virtual void InsertHyphen( const sal_Int32 nPos ) override; // insert hyphen public: SwHyphWrapper( SwView* pVw, diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 187a02c1b320..fec27ec571f7 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -34,8 +34,8 @@ class SwWrtShell; // insert fields class SwFieldInputDlg: public SvxStandardDialog { - virtual void Apply() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; + virtual void Apply() override; + virtual void StateChanged( StateChangedType ) override; SwWrtShell& rSh; SwInputField* pInpField; @@ -54,7 +54,7 @@ public: SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); virtual ~SwFieldInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 444c5b32202f..de5a236bc508 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -40,7 +40,7 @@ public: const OUString& aTableName ); protected: - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; }; class SwInputWindow : public ToolBox @@ -71,8 +71,8 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize() SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; + virtual void Resize() override; + virtual void Click() override; DECL_LINK_TYPED( MenuHdl, Menu *, bool ); DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void ); void ApplyFormula(); @@ -81,9 +81,9 @@ protected: public: SwInputWindow( vcl::Window* pParent ); virtual ~SwInputWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void ShowWin(); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index b292f3106c66..03acd7eea195 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -60,14 +60,14 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK_TYPED(NumberExtCharHdl, Button *, void); DECL_LINK_TYPED(NextPrevHdl, Button *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void Init(); public: SwInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false); virtual ~SwInsFootNoteDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetFontName() { return m_aFontName; } bool IsEndNote() { return m_pEndNoteBtn->IsChecked(); } diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index ba9b57958d53..e4bd75c9bcf0 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -66,7 +66,7 @@ class SwInsTableDlg : public SfxModalDialog public: SwInsTableDlg( SwView& rView ); virtual ~SwInsTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName, diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index f436557ae5f3..43afc15e5c9c 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -63,7 +63,7 @@ private: DECL_LINK_TYPED(InsertFileHdl, Button *, void); DECL_LINK_TYPED(DlgClosedHdl, sfx2::FileDialogHelper *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void CheckTravel(); void SetField(); @@ -71,7 +71,7 @@ private: public: SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); virtual ~SwJavaEditDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetScriptText() const { return aText; } diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index d9ffa02b8a6c..f8102bb3b9f8 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -50,13 +50,13 @@ class SwLabDlg : public SfxTabDialog sal_uInt16 m_nPrivateId; void _ReplaceGroup( const OUString &rMake ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel); virtual ~SwLabDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwLabRec* GetRecord(const OUString &rRecName, bool bCont); void GetLabItem(SwLabItem &rItem); diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx index 5f47a4b638e6..783a9b105a33 100644 --- a/sw/source/uibase/inc/labelcfg.hxx +++ b/sw/source/uibase/inc/labelcfg.hxx @@ -38,13 +38,13 @@ private: std::vector<OUString> m_aManufacturers; std::map< OUString, std::map<OUString, SwLabelMeasure> > m_aLabels; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLabelConfig(); virtual ~SwLabelConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;} diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index c278c55eec30..629b0ae06d1c 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -36,9 +36,9 @@ public: SwLabItem& operator =(const SwLabItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; OUString aLstMake; // remember last selection OUString aLstType; @@ -111,14 +111,14 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLabCfgItem(bool bLabel); SwLabItem& GetItem() {return aItem;} - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 2d18ef619da8..05ac54261850 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -55,7 +55,7 @@ private: public: SwLineNumberingDlg(SwView *pVw); virtual ~SwLineNumberingDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 81f4588a13f6..4f3ea2383ed7 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -57,13 +57,13 @@ class SwMailConfigPage : public SfxTabPage public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwMailConfigPage(); - 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/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index 597273496683..4a33570314ed 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -133,8 +133,8 @@ public: void addListener(::rtl::Reference<IMailDispatcherListener> listener); protected: - virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL run() override; + virtual void SAL_CALL onTerminated() override; private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx index ade2a24c57cf..8b5fd12c7ff0 100644 --- a/sw/source/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/uibase/inc/mailmergechildwindow.hxx @@ -31,9 +31,9 @@ class SwMailMergeChildWin : public SfxFloatingWindow public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual ~SwMailMergeChildWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const override; }; class SwMailMergeChildWindow : public SfxChildWindow diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index eb0eed5ee5db..a707fa5cdcda 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -66,11 +66,11 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Resize() override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; void UpdateScrollBar(); DECL_LINK_TYPED(ScrollHdl, ScrollBar*,void); @@ -78,7 +78,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window public: SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER); virtual ~SwAddressPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void positionScrollBar(); @@ -155,8 +155,8 @@ public: {} virtual ~SwAuthenticator(); - virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) override; }; @@ -171,7 +171,7 @@ public: virtual ~SwConnectionContext(); virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; class SwMutexBase @@ -193,13 +193,13 @@ public: virtual ~SwConnectionListener(); virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; }; class SW_DLLPUBLIC SwMailTransferable : @@ -218,40 +218,40 @@ class SW_DLLPUBLIC SwMailTransferable : virtual ~SwMailTransferable(); virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; }; @@ -277,37 +277,37 @@ public: virtual ~SwMailMessage(); // attributes - virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSubject(const OUString& _subject) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // methods virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; void SetSenderName(const OUString& rSenderName) { m_sSenderName = rSenderName; diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 78449ae283af..cadd1cdb164f 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -58,12 +58,12 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard using svt::OWizardMachine::skipUntil; protected: - virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; - virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) override; + virtual void enterState( WizardState _nState ) override; // roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE; + virtual OUString getStateDisplayName( WizardState _nState ) const override; public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); @@ -89,8 +89,8 @@ public: void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute() SAL_OVERRIDE; - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; + virtual short Execute() override; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; }; #endif diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 085b535d0642..75be32484346 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -111,7 +111,7 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED( SaveTypeHdl, Button*, void ); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; bool ExecQryShell(); public: @@ -122,7 +122,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); virtual ~SwMailMergeDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline DBManagerOptions GetMergeType() { return nMergeType; } @@ -143,7 +143,7 @@ class SwMailMergeCreateFromDlg : public ModalDialog public: SwMailMergeCreateFromDlg(vcl::Window* pParent); virtual ~SwMailMergeCreateFromDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsThisDocument() const { return m_pThisDocRB->IsChecked(); @@ -156,7 +156,7 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog public: SwMailMergeFieldConnectionsDlg(vcl::Window* pParent); virtual ~SwMailMergeFieldConnectionsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsUseExistingConnections() const { diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 94fe4bfa94de..3c522329276c 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -30,12 +30,12 @@ class SwMergeTableDlg : public SvxStandardDialog bool& m_rMergePrev; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev ); virtual ~SwMergeTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 41ccbb425dc1..c05adc2a1099 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -38,11 +38,11 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog SwTOXMgr& rMgr; sal_uInt16 nPos; - void Apply() SAL_OVERRIDE; + void Apply() override; public: SwMultiTOXMarkDlg( vcl::Window* pParent, SwTOXMgr &rTOXMgr ); virtual ~SwMultiTOXMarkDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx index 4859a5682b13..90fe6d348d6a 100644 --- a/sw/source/uibase/inc/navicfg.hxx +++ b/sw/source/uibase/inc/navicfg.hxx @@ -36,13 +36,13 @@ class SwNavigationConfig : public utl::ConfigItem static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwNavigationConfig(); virtual ~SwNavigationConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; ContentTypeId GetRootType()const {return nRootType;} void SetRootType(ContentTypeId nSet){ diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 7f4ba5922ae5..1bfca38237d5 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -43,8 +43,8 @@ enum class RegionMode; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent &rEvt) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -123,11 +123,11 @@ class SwNavigationPI : public vcl::Window, protected: - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; // release ObjectShellLock early enough for app end - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; NumEditAction& GetPageEdit(); bool ToggleTree(); @@ -137,7 +137,7 @@ public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, vcl::Window*); virtual ~SwNavigationPI(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GotoPage(); // jump to page; bindable function @@ -145,7 +145,7 @@ public: void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; static OUString CreateDropFileName( TransferableDataHelper& rData ); static OUString CleanEntry(const OUString& rEntry); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 348242561141..c957abf8aed3 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -114,12 +114,12 @@ public: SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage(); - 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); @@ -149,8 +149,8 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog sal_uInt16 m_nPositionPageId; protected: - virtual short Ok() SAL_OVERRIDE; - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual short Ok() override; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; DECL_LINK_TYPED(RemoveNumberingHdl, Button*, void); public: SwSvxNumBulletTabDialog(vcl::Window* pParent, diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index b1968d7f6857..ce553db31d3f 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -37,9 +37,9 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox public: SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle = WB_BORDER ); virtual ~SwNumberingTypeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void Reload(sal_uInt16 nTypeFlags); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 634c07be327c..9a252de063d2 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -48,7 +48,7 @@ public: NumFormatListBox(vcl::Window* pWin, WinBits nStyle); virtual ~NumFormatListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Clear(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 5825f9845b67..741d6dfcce57 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -69,15 +69,15 @@ protected: public: SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwParagraphNumTabPage(); - 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 aPageRg; } - 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 EnableNewStart(); void DisableOutline(); diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 175bed1573bc..1fae3ac8ab32 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : 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: NumberingPreview(vcl::Window* pParent, const ResId& rResId) diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 75db09d9166a..1281502dc2dc 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -62,12 +62,12 @@ private: public: SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); - 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/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 9f6483273da1..96d6bf678776 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -65,13 +65,13 @@ private: public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLoadOptPage(); - 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 SwCaptionOptDlg : public SfxSingleTabDialog @@ -83,7 +83,7 @@ public: class CaptionComboBox : public SwComboBox { protected: - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; public: CaptionComboBox(vcl::Window* pParent, WinBits nStyle) @@ -101,10 +101,10 @@ private: public: SwCaptionPreview(vcl::Window* pParent, WinBits nStyle); void Init(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetPreviewText( const OUString& rText ); - 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; }; class SwCaptionOptPage : public SfxTabPage @@ -169,13 +169,13 @@ public: SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); - 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/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 33641c98fdc3..95c2e191f78d 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -65,12 +65,12 @@ public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage(); - 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; }; // TabPage printer settings additions @@ -111,15 +111,15 @@ class SwAddPrinterTabPage : public SfxTabPage public: SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage(); - 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; void SetFax(const std::vector<OUString>& ); void SetPreview(bool bPrev); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; class SwStdFontTabPage : public SfxTabPage @@ -180,19 +180,19 @@ class SwStdFontTabPage : public SfxTabPage SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwStdFontTabPage(); - 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 bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; void SetFontMode(sal_uInt8 nGroup) { nFontGroup = nGroup; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; class SwTableOptionsTabPage : public SfxTabPage @@ -224,15 +224,15 @@ class SwTableOptionsTabPage : public SfxTabPage public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwTableOptionsTabPage(); - 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; void SetWrtShell(SwWrtShell* pSh) { pWrtShell = pSh; } - virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated( const SfxAllItemSet& aSet) override; }; @@ -269,18 +269,18 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage public: SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwShdwCrsrOptionsTabPage(); - 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; void SetWrtShell(SwWrtShell* pSh) { m_pWrtShell = pSh; } - virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE; + virtual void PageCreated( const SfxAllItemSet& aSet ) override; }; // mark preview @@ -302,12 +302,12 @@ class SwMarkPreview : public vcl::Window sal_uInt16 nMarkPos; - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; void PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect); void InitColors(); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); @@ -315,7 +315,7 @@ public: inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; // redlining options @@ -349,12 +349,12 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: SwRedlineOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwRedlineOptionsTabPage(); - 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; }; // TabPage test settings for SW @@ -366,12 +366,12 @@ class SwTestTabPage : public SfxTabPage public: SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwTestTabPage(); - 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; private: VclPtr<CheckBox> m_pTest1CBox; @@ -409,12 +409,12 @@ class SwCompareOptionsTabPage : public SfxTabPage public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompareOptionsTabPage(); - 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/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 9eb16b76bb29..0856a51c7db0 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -63,15 +63,15 @@ protected: DECL_LINK_TYPED( FormHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; + virtual short Ok() override; public: SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwOutlineTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwNumRule* GetNumRule() {return pNumRule;} sal_uInt16 GetLevel(const OUString &rFormatName) const; @@ -122,15 +122,15 @@ class SwOutlineSettingsTabPage : public SfxTabPage public: SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwOutlineSettingsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetWrtShell(SwWrtShell* pShell); - 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 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index a72d20e92d72..666957c39e77 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -38,11 +38,11 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } - 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 ~SwFootNotePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<RadioButton> m_pMaxHeightPageBtn; @@ -68,8 +68,8 @@ private: 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; }; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 95a084e47bc5..7180ad473587 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -86,16 +86,16 @@ class SwTextGridPage: public SfxTabPage public: SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwTextGridPage(); - 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 bool FillItemSet(SfxItemSet *rSet) override; + virtual void Reset(const SfxItemSet *rSet) override; - 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; }; #endif diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx index e4b0c66f96f1..43b6ce338e74 100644 --- a/sw/source/uibase/inc/popbox.hxx +++ b/sw/source/uibase/inc/popbox.hxx @@ -31,9 +31,9 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper using ToolBox::DoubleClick; protected: - virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent &rEvt) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index c24fa277ae94..e07f066d45ab 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -65,11 +65,11 @@ public: virtual ~SwPagePreviewWin(); // calls SwViewShell::Paint - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void KeyInput( const KeyEvent & ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual void DataChanged( const DataChangedEvent& ) override; void SetViewShell( SwViewShell* pShell ); @@ -141,7 +141,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, ScrollFlags nFlags = ScrollFlags::NONE) SAL_OVERRIDE; + void Scroll(long nXMove, long nYMove, ScrollFlags nFlags = ScrollFlags::NONE) override; /** Method to enable/disable book preview @param _bBookPreview @@ -152,7 +152,7 @@ public: */ bool SetBookPreviewMode( const bool _bBookPreview ); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; }; /** @@ -200,10 +200,10 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void); SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; + SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) override; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); @@ -220,8 +220,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SfxRequest* _pReq = 0 ); protected: - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 07c31232d494..3c7b4810f97a 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -140,10 +140,10 @@ class SwModelessRedlineAcceptDlg : public SfxModelessDialog public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, vcl::Window *pParent); virtual ~SwModelessRedlineAcceptDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Activate() SAL_OVERRIDE; - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void Activate() override; + virtual void FillInfo(SfxChildWinInfo&) const override; void Initialize (SfxChildWinInfo* pInfo); }; @@ -157,7 +157,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild ); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; }; /// Redline (Manage Changes) panel for the sidebar. @@ -167,11 +167,11 @@ class SwRedlineAcceptPanel : public PanelLayout, public SfxListener public: SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame); virtual ~SwRedlineAcceptPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// We need to be a SfxListener to be able to update the list of changes when we get SFX_HINT_DOCCHANGED. using Control::Notify; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; #endif diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 22b94605f697..0bbb394eddb3 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -131,7 +131,7 @@ class SwEditRegionDlg : public SfxModalDialog public: SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); virtual ~SwEditRegionDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SelectSection(const OUString& rSectionName); @@ -183,12 +183,12 @@ class SwInsertSectionTabPage : public SfxTabPage public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -228,10 +228,10 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage public: SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFootnoteEndTabPage(); - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -247,10 +247,10 @@ class SwSectionIndentTabPage : public SfxTabPage public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -270,8 +270,8 @@ class SwInsertSectionTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; public: SwInsertSectionTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -290,7 +290,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index 9727c8d9d555..4dd2565287a6 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -33,12 +33,12 @@ class SwTableHeightDlg : public SvxStandardDialog SwWrtShell &rSh; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwTableHeightDlg( vcl::Window *pParent, SwWrtShell &rS ); virtual ~SwTableHeightDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 1c43a34e1e2d..d2d6ff267985 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -35,7 +35,7 @@ class SwScrollbar: public ScrollBar public: void ExtendedShow( bool bVisible = true ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override; bool IsVisible(bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // changing of document size diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 81914a479142..3dfb3ec8c149 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -35,7 +35,7 @@ protected: public: SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); virtual ~SwSelGlossaryDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InsertGlos(const OUString &rRegion, const OUString &rGlosName) { diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 456108504aac..9e50950ba0c0 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -36,12 +36,12 @@ class SwSplitTableDlg : public SvxStandardDialog sal_uInt16 m_nSplit; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwSplitTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetSplitMode() const { return m_nSplit; } }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 1fdd395228e0..e7cea26f9e10 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -43,13 +43,13 @@ class TextViewOutWin : public vcl::Window ExtTextView* pTextView; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_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 Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void KeyInput( const KeyEvent& rKeyEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void DataChanged( const DataChangedEvent& ) override; public: TextViewOutWin(vcl::Window* pParent, WinBits nBits) : @@ -102,22 +102,22 @@ private: protected: - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& ) override; + virtual void GetFocus() override; // virtual void LoseFocus(); void CreateTextEngine(); void DoSyntaxHighlight( sal_uInt16 nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); public: SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); virtual ~SwSrcEditWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetScrollBarRanges(); void InitScrollBars(); @@ -132,7 +132,7 @@ public: TextViewOutWin* GetOutWin() {return pOutWin;} - virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE; + virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override; void ClearModifyFlag() { pTextEngine->SetModified(false); } @@ -146,7 +146,7 @@ public: void SetStartLine(sal_uInt16 nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 3999908a9090..e381e4c201a6 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -41,7 +41,7 @@ class SwSrcView: public SfxViewShell void Init(); // for read-only switching - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, @@ -77,8 +77,8 @@ public: void Load(SwDocShell* pDocShell); - virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; - virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) override; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index e67b47a7e7bb..db80c6f8014a 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -74,7 +74,7 @@ class SwSortDlg : public SvxStandardDialog sal_uInt16 nX; sal_uInt16 nY; - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; sal_Unicode GetDelimChar() const; DECL_LINK_TYPED( CheckHdl, Button*, void ); @@ -86,7 +86,7 @@ class SwSortDlg : public SvxStandardDialog public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); virtual ~SwSortDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index a778987903b5..b2b791a9a212 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -135,14 +135,14 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwTransferable& operator=( const SwTransferable& ) = delete; protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; + const css::datatransfer::DataFlavor& rFlavor ) override; + virtual void DragFinished( sal_Int8 nDropAction ) override; + virtual void ObjectReleased() override; using TransferableHelper::StartDrag; @@ -204,7 +204,7 @@ public: void Invalidate() {m_pWrtShell = 0;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index d07472f99df5..be17d9871897 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -64,9 +64,9 @@ public: virtual ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); - virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = 0) SAL_OVERRIDE; + virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = 0) override; - virtual void RemoveEntryAt(sal_Int32 nPos) SAL_OVERRIDE; + virtual void RemoveEntryAt(sal_Int32 nPos) override; sal_Int32 GetSwEntryPos(const SwBoxEntry& rEntry) const; const SwBoxEntry& GetSwEntry(sal_Int32) const; diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index c8028265e616..edced676f6ab 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -29,7 +29,7 @@ public: SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); virtual ~SwMessageAndEditDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 2a4728a689e1..863f2d6d30c1 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -30,10 +30,10 @@ class SwModalRedlineAcceptDlg : public SfxModalDialog public: SwModalRedlineAcceptDlg(vcl::Window *pParent); virtual ~SwModalRedlineAcceptDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AcceptAll( bool bAccept ); - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; }; #endif diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index 523dcce86a26..3661d73b9b8e 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -49,7 +49,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess ); virtual ~SwRenameXNamedDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetForbiddenChars(const OUString& rSet) { diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 9f22e2b50356..d04043961249 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -34,13 +34,13 @@ public: SfxBindings& rBindings, WinBits nWinStyle); virtual ~SwCommentRuler (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** * Paint the ruler. * \param rRect ignored */ - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -55,26 +55,26 @@ protected: * * When on comment control, it toggles the comment panel visibility. */ - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; /** * Callback function to handle a mouse move event. * * When on comment control, it let the control responsive by highlighting. */ - virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) override; /** * Callback function to handle a context menu call (mouse right button click). * * When on comment control, it does not do anything. */ - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; /** * Update the view. * * Update the ruler appearance according to the document view and * current cursor position. */ - virtual void Update() SAL_OVERRIDE; + virtual void Update() override; /** * Get the rectangle area that should be used to draw the comment control. diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 684023fb526c..0dbbce3a3c17 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -48,9 +48,9 @@ class SwCondCollPage : public SfxTabPage bool m_bNewTemplate; virtual ~SwCondCollPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; DECL_LINK_TYPED( OnOffHdl, Button*, void ); DECL_LINK_TYPED( AssignRemoveHdl, ListBox&, void); @@ -72,8 +72,8 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } - 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 SetCollection( SwFormat* pFormat, bool bNew ); }; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index d27e74404d9d..a5e8608f5813 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -90,7 +90,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog bool bExampleCreated; bool bGlobalFlag; - virtual short Ok() SAL_OVERRIDE; + virtual short Ok() override; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK_TYPED(CreateExample_Hdl, SwOneExampleFrame&, void); @@ -102,9 +102,9 @@ public: SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false); virtual ~SwMultiTOXTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; SwForm* GetForm(CurTOXType eType); @@ -222,13 +222,13 @@ class SwTOXSelectTabPage : public SfxTabPage public: SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); - 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; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -285,7 +285,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer public: SwTokenWindow(vcl::Window* pParent); virtual ~SwTokenWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; } @@ -315,8 +315,8 @@ public: bool CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void GetFocus() SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void setAllocation(const Size &rAllocation) override; void SetFocus2theAllBtn(); private: sal_uInt32 GetControlIndex(FormTokenType eType) const; @@ -328,11 +328,11 @@ class SwIdxTreeListBox : public SvTreeListBox { VclPtr<SwTOXEntryTabPage> pParent; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle); virtual ~SwIdxTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } }; @@ -438,12 +438,12 @@ class SwTOXEntryTabPage : public SfxTabPage public: SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -453,7 +453,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; }; class SwTOXStylesTabPage : public SfxTabPage @@ -485,13 +485,13 @@ class SwTOXStylesTabPage : public SfxTabPage public: SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); - 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; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 4fe7e7959722..9d0cf903c92d 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -152,7 +152,7 @@ public: class SwIndexMarkFloatDlg : public SfxModelessDialog { SwIndexMarkPane m_aContent; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -168,7 +168,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog public: SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; }; class SwAuthMarkModalDlg; @@ -227,7 +227,7 @@ public: class SwAuthMarkFloatDlg : public SfxModelessDialog { SwAuthorMarkPane m_aContent; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -243,7 +243,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog public: SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index 6a9c8a6ea6af..874c090c5f93 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -37,7 +37,7 @@ class SwParaDlg: public SfxTabDialog sal_uInt16 m_nAreaId; sal_uInt16 m_nTransparenceId; - void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; public: SwParaDlg( vcl::Window *pParent, diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index af5836c6999e..99c678764c75 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -33,8 +33,8 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - 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; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 6f6d8f5c7d12..7dc2c24f9b71 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -32,7 +32,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual ~SwSyncBtnDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwSyncChildWin : public SfxChildWindow diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 2bd62de07066..45f9ca152e33 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -35,7 +35,7 @@ class SwTableTabDlg : public SfxTabDialog sal_uInt16 m_nBackgroundId; sal_uInt16 m_nBorderId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; public: SwTableTabDlg( vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 2c6b868c81b4..523f1aebd052 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -82,7 +82,7 @@ public: bool bSetAutoFormat = true, const SwTableAutoFormat* pSelFormat = 0 ); virtual ~SwAutoFormatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const; }; diff --git a/sw/source/uibase/inc/tbxanchr.hxx b/sw/source/uibase/inc/tbxanchr.hxx index fcc6db520fe9..5ee3595f8d87 100644 --- a/sw/source/uibase/inc/tbxanchr.hxx +++ b/sw/source/uibase/inc/tbxanchr.hxx @@ -27,9 +27,9 @@ class SwTbxAnchor : public SfxToolBoxControl public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void Click() override; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index d461e5a5fda5..370fce92670b 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -63,7 +63,7 @@ private: public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index dd60e200787a..db280d42c315 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -76,10 +76,10 @@ public: SwWrtShell* pActShell = 0, bool bNew = false ); - virtual void RefreshInputSet() SAL_OVERRIDE; + virtual void RefreshInputSet() override; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; }; #endif diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx index 37722d748590..fec163968e19 100644 --- a/sw/source/uibase/inc/tmplctrl.hxx +++ b/sw/source/uibase/inc/tmplctrl.hxx @@ -24,11 +24,11 @@ class SwTemplateControl : public SfxStatusBarControl { protected: - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 54427c49bec7..3b23ac631bf1 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -39,16 +39,16 @@ public: SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem ); virtual ~SwPageFootnoteInfoItem(); - 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; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; } const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; } @@ -62,8 +62,8 @@ public: SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); SwPtrItem( const SwPtrItem& rItem ); - 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* GetValue() const { return pMisc; } }; @@ -77,11 +77,11 @@ public: SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); - 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; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } @@ -92,7 +92,7 @@ class SwBackgroundDestinationItem : public SfxUInt16Item public: SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; }; class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem @@ -103,8 +103,8 @@ public: SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = NULL); SwPaMItem( const SwPaMItem& rItem ); - 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; SwPaM* GetValue() const { return m_pPaM; } }; diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 2a88b7229a5d..a1558fd82298 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -57,7 +57,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; void ViewDestroyed() { pView = 0; } }; @@ -70,12 +70,12 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper< // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw (com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 9563e16a4f01..acaa4033b36a 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -64,26 +64,26 @@ public: SwXAutoTextContainer(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XAutoTextContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; @@ -111,44 +111,44 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XNamed - virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; void Invalidate(); }; @@ -193,7 +193,7 @@ protected: void implFlushDocument( bool _bCloseDoc = false ); // SfxListener overridables - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; protected: virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor @@ -204,33 +204,33 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XAutoTextEntry - virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; void Invalidate() {pGlossaries = 0;} const SwGlossaries* GetGlossaries() { return pGlossaries; } @@ -254,7 +254,7 @@ public: virtual ~SwAutoTextEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: @@ -265,7 +265,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; virtual void getByName( SvxMacro& rMacro, /// macro to be filled @@ -273,7 +273,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; }; #endif diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 3871d3c18257..51088a65c8c5 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -67,21 +67,21 @@ public: virtual ~SwXDispatchProviderInterceptor(); //XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // view destroyed void Invalidate(); @@ -109,15 +109,15 @@ public: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const sal_Char* GetDBChangeURL(); }; diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 99f21d17a7ef..2620d258b940 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -140,33 +140,33 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XCancellable - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XMailMergeBroadcaster - virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 5def889b8ec6..b629a16b242a 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -54,19 +54,19 @@ public: //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XPrintSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; enum SwXPrintSettingsType @@ -89,27 +89,27 @@ protected: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _postSetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _preGetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual ~SwXPrintSettings() throw(); @@ -118,11 +118,11 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; class SwXViewSettings : public comphelper::ChainableHelperNoState @@ -145,33 +145,33 @@ protected: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void _postSetValues() throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _preGetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual ~SwXViewSettings() throw(); @@ -179,9 +179,9 @@ public: SwXViewSettings(bool bWeb, SwView* pView); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = false;} diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index ff7839ca53b9..fbb9fabf9f05 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -42,9 +42,9 @@ class SwFrmCtrlWindow : public VclEventBox public: SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual Size GetOptimalSize() const override; + virtual void Resize() override; }; class MenuResource : public Resource diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index aa5fb76a5aec..806d11da27b9 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -76,76 +76,76 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; - virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw() override; + virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XSelectionSupplier virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XTextViewCursorSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XRubySelection virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setRubyList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) override; void NotifySelChanged(); void NotifyDBChanged(); @@ -183,154 +183,154 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XTextCursor - neu virtual void SAL_CALL collapseToStart() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL collapseToEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isCollapsed() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XPageCursor virtual sal_Bool SAL_CALL jumpToFirstPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL jumpToLastPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + std::exception) override; + virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setString(const OUString& aString) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XScreenCursor virtual sal_Bool SAL_CALL screenDown() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL screenUp() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XViewCursor virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XLineCursor virtual sal_Bool SAL_CALL isAtStartOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isAtEndOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; //XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const SAL_OVERRIDE; - virtual SwPaM* GetPaM() SAL_OVERRIDE; - virtual const SwDoc* GetDoc() const SAL_OVERRIDE; - virtual SwDoc* GetDoc() SAL_OVERRIDE; + virtual const SwPaM* GetPaM() const override; + virtual SwPaM* GetPaM() override; + virtual const SwDoc* GetDoc() const override; + virtual SwDoc* GetDoc() override; }; #endif diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 560fafab46e9..865aadf7daec 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -34,14 +34,14 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwContentViewConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -55,13 +55,13 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwLayoutViewConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -73,13 +73,13 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwGridConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwGridConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -91,13 +91,13 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwCursorConfig(SwMasterUsrPref& rParent); virtual ~SwCursorConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -108,13 +108,13 @@ private: SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<OUString> aPropNames; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwWebColorConfig(SwMasterUsrPref& rParent); virtual ~SwWebColorConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx index fb47e04263be..240dbb083a7b 100644 --- a/sw/source/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/uibase/inc/viewlayoutctrl.hxx @@ -35,10 +35,10 @@ public: SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual ~SwViewLayoutControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; - virtual bool MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE; - virtual bool MouseMove( const MouseEvent & ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual bool MouseButtonDown( const MouseEvent & ) override; + virtual bool MouseMove( const MouseEvent & ) override; }; #endif diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx index 8d2aeeb05d54..9130600ae3f0 100644 --- a/sw/source/uibase/inc/wordcountctrl.hxx +++ b/sw/source/uibase/inc/wordcountctrl.hxx @@ -28,7 +28,7 @@ public: virtual ~SwWordCountStatusBarControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 0b52b2d230b7..75dbd31e0552 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -28,7 +28,7 @@ struct SwDocStat; class SwWordCountFloatDlg : public SfxModelessDialog { - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc); void showCJK(bool bShowCJK); void showStandardizedPages(bool bShowStandardizedPages); @@ -57,7 +57,7 @@ public: vcl::Window *pParent, SfxChildWinInfo* pInfo); virtual ~SwWordCountFloatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateCounts(); void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 3362d314d02a..6f65bb7c14a1 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -63,10 +63,10 @@ public: SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxAutoTextCtrl(); - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; @@ -79,10 +79,10 @@ public: SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxFieldCtrl(); - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; class SwScrollNaviPopup; @@ -91,8 +91,8 @@ class SwScrollNaviToolBox : public ToolBox { VclPtr<SwScrollNaviPopup> m_pNaviPopup; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwScrollNaviToolBox(vcl::Window* pParent, SwScrollNaviPopup* pNaviPopup, WinBits nWinStyle) @@ -101,7 +101,7 @@ public: { } virtual ~SwScrollNaviToolBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwScrollNaviPopup : public SfxPopupWindow @@ -118,12 +118,12 @@ class SwScrollNaviPopup : public SfxPopupWindow protected: DECL_LINK_TYPED(SelectHdl, ToolBox*, void); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent ); virtual ~SwScrollNaviPopup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static OUString GetQuickHelpText(bool bNext); @@ -139,7 +139,7 @@ class SwHlpImageButton : public ImageButton SwHlpImageButton(vcl::Window* pParent, const ResId& rResId, bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; @@ -153,9 +153,9 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index dc2720013da5..0bd251d83c23 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -78,12 +78,12 @@ class SwWrapTabPage: public SfxTabPage bool m_bContourImage; virtual ~SwWrapTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ApplyImageList(); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; DECL_LINK( RangeModifyHdl, MetricField * ); DECL_LINK_TYPED( RangeLoseFocusHdl, Control&, void ); @@ -100,8 +100,8 @@ 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 bool FillItemSet(SfxItemSet *rSet) override; + virtual void Reset(const SfxItemSet *rSet) override; static const sal_uInt16* GetRanges() { return m_aWrapPageRg; } inline void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 904da2b56aad..421152791b11 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -326,13 +326,13 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = 0 ); void LaunchOLEObj( long nVerb = 0 ); // start server - virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE; + virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTextFrmPrtAreaChanged = false ) SAL_OVERRIDE; + const bool bNoTextFrmPrtAreaChanged = false ) override; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, - const SwRect &rFrm ) SAL_OVERRIDE; + const SwRect &rFrm ) override; // styles and formats @@ -392,7 +392,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. - virtual void DrawSelChanged( ) SAL_OVERRIDE; + virtual void DrawSelChanged( ) override; // jump to bookmark and set the "selections-flags" correctly again bool GotoMark( const ::sw::mark::IMark* const pMark ); @@ -432,8 +432,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; - virtual void SetReadonlyOption( bool bSet ) SAL_OVERRIDE; + virtual void ApplyViewOptions( const SwViewOption &rOpt ) override; + virtual void SetReadonlyOption( bool bSet ) override; // automatic update of styles void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet); @@ -469,7 +469,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false); void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning); - virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) SAL_OVERRIDE; + virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) override; private: diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx index 44e44f7e5f77..40b1f8872ed7 100644 --- a/sw/source/uibase/inc/wview.hxx +++ b/sw/source/uibase/inc/wview.hxx @@ -25,7 +25,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell() SAL_OVERRIDE; + virtual void SelectShell() override; public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx index 758b674684fe..f4d04b4239f6 100644 --- a/sw/source/uibase/inc/zoomctrl.hxx +++ b/sw/source/uibase/inc/zoomctrl.hxx @@ -26,10 +26,10 @@ class SwZoomControl : public SvxZoomStatusBarControl private: OUString sPreviewZoom; public: - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); |