diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /cui | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'cui')
109 files changed, 839 insertions, 839 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 8b59ed2641c1..38c4c8a4561a 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -623,7 +623,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString virtual ~SfxAccCfgLBoxString_Impl(); virtual void Paint( - const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index f4df22011df3..cb0ae07c63a7 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1323,7 +1323,7 @@ public: ~PopupPainter() { } virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, - const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) + const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE { SvLBoxString::Paint(rPos, rOutDev, pView, pEntry); diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 51a4aabbeab0..0df1b1ebdd63 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -53,7 +53,7 @@ public: void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); protected: - virtual bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; private: void ImplInitDocument(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f5e3973d729..00a48e6111b0 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -433,7 +433,7 @@ public: IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText, Image* pMacroImg, Image* pComponentImg ); virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 6d495abd5a34..72bc32878062 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -112,9 +112,9 @@ public: const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; } - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; @@ -135,9 +135,9 @@ public: {m_eLanguage = eLang;} - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; @@ -157,9 +157,9 @@ public: void SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;} - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; }//namespace svx #endif diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a89f7e94f715..dda350523873 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -122,8 +122,8 @@ public: ~SpellUndoAction_Impl(); - virtual void Undo(); - virtual sal_uInt16 GetId() const; + virtual void Undo() SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; void SetEnableChangePB(){m_bEnableChangePB = true;} bool IsEnableChangePB(){return m_bEnableChangePB;} diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 3b308e2aea99..8ad4cc286d9d 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -135,8 +135,8 @@ class HexColorControl : public Edit public: HexColorControl( Window* pParent, const ResId& rResId ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Paste(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Paste() SAL_OVERRIDE; void SetColor( sal_Int32 nColor ); sal_Int32 GetColor(); @@ -258,7 +258,7 @@ class ColorPreviewControl : public Control public: ColorPreviewControl( Window* pParent, const ResId& rResId ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetColor( const Color& rColor ); private: @@ -297,12 +297,12 @@ public: ColorFieldControl( Window* pParent, const ResId& rResId ); ~ColorFieldControl(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void UpdateBitmap(); void ShowPosition( const Point& rPos, bool bUpdate ); @@ -670,12 +670,12 @@ public: ColorSliderControl( Window* pParent, const ResId& rResId ); ~ColorSliderControl(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void UpdateBitmap(); void ChangePosition( long nY ); @@ -1386,20 +1386,20 @@ public: ColorPicker( Reference< XComponentContext > const & xContext ); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception); + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: Reference< XComponentContext > mxContext; diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index edb1cf65e0c7..00be5f74fb15 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -41,15 +41,15 @@ public: SvxClickInfoCtr( Window* pParent, const ResId& rResId ); ~SvxClickInfoCtr(); - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; } const Link& GetActivateHdl() const { return aActivateLink; } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -91,7 +91,7 @@ protected: GroupBox aAuditBox; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; private: PushButton* implGetButton( ButtonType _eType ) const; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index aadceba8445a..c49446480782 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -217,7 +217,7 @@ namespace svx const PseudoRubyText::RubyPosition _ePosition ); protected: - virtual void Paint( const Rectangle& _rRect ); + virtual void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; }; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 9b6a7d0d7769..8211897ef711 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -54,7 +54,7 @@ public: SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr ); virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; #endif diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 58f23550366e..35c7152e1fce 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1602,7 +1602,7 @@ public: m_pDialog.reset( new SvxMacroAssignDlg( _pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent ) ); } - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; virtual ~SvxMacroAssignDialog(); private: diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index ecde26d5e532..feaad78c1625 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -67,7 +67,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() ; + virtual short Execute() SAL_OVERRIDE ; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -86,8 +86,8 @@ class VclAbstractDialog2_Impl : public VclAbstractDialog2 public: VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} virtual ~VclAbstractDialog2_Impl(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); - virtual long GetResult(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; + virtual long GetResult() SAL_OVERRIDE; private: DECL_LINK( EndDialogHdl, Dialog* ); }; @@ -100,31 +100,31 @@ class CuiVclAbstractDialog_Impl : public VclAbstractDialog class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog { DECL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl,Dialog) - virtual void Update() ; - virtual void Sync() ; + virtual void Update() SAL_OVERRIDE ; + virtual void Sync() SAL_OVERRIDE ; }; class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const ; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE ; }; class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class SvxDistributeDialog; @@ -132,71 +132,71 @@ class AbstractSvxDistributeDialog_Impl: public AbstractSvxDistributeDialog { DECL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl,SvxDistributeDialog) public: - virtual SvxDistributeHorizontal GetDistributeHor() const; - virtual SvxDistributeVertical GetDistributeVer() const; + virtual SvxDistributeHorizontal GetDistributeHor() const SAL_OVERRIDE; + virtual SvxDistributeVertical GetDistributeVer() const SAL_OVERRIDE; }; class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog { DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog) - virtual void EndDialog(long nResult = 0); - virtual void EnableRubySupport( bool _bVal ); - virtual void SetByCharacter( bool _bByCharacter ) ; - virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); - virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); - virtual void SetOptionsChangedHdl( const Link& _rHdl ); - virtual void SetIgnoreHdl( const Link& _rHdl ); - virtual void SetIgnoreAllHdl( const Link& _rHdl ) ; - virtual void SetChangeHdl( const Link& _rHdl ) ; - virtual void SetChangeAllHdl( const Link& _rHdl ) ; - virtual void SetClickByCharacterHdl( const Link& _rHdl ) ; - virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) ; - virtual void SetFindHdl( const Link& _rHdl ); - virtual bool GetUseBothDirections( ) const; + virtual void EndDialog(long nResult = 0) SAL_OVERRIDE; + virtual void EnableRubySupport( bool _bVal ) SAL_OVERRIDE; + virtual void SetByCharacter( bool _bByCharacter ) SAL_OVERRIDE ; + virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE; + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE; + virtual void SetOptionsChangedHdl( const Link& _rHdl ) SAL_OVERRIDE; + virtual void SetIgnoreHdl( const Link& _rHdl ) SAL_OVERRIDE; + virtual void SetIgnoreAllHdl( const Link& _rHdl ) SAL_OVERRIDE ; + virtual void SetChangeHdl( const Link& _rHdl ) SAL_OVERRIDE ; + virtual void SetChangeAllHdl( const Link& _rHdl ) SAL_OVERRIDE ; + virtual void SetClickByCharacterHdl( const Link& _rHdl ) SAL_OVERRIDE ; + virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) SAL_OVERRIDE ; + virtual void SetFindHdl( const Link& _rHdl ) SAL_OVERRIDE; + virtual bool GetUseBothDirections( ) const SAL_OVERRIDE; virtual editeng::HangulHanjaConversion::ConversionDirection - GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; + GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE; virtual void SetCurrentString( const OUString& _rNewString, const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true - ); - virtual OUString GetCurrentString( ) const ; + ) SAL_OVERRIDE; + virtual OUString GetCurrentString( ) const SAL_OVERRIDE ; virtual editeng::HangulHanjaConversion::ConversionFormat - GetConversionFormat( ) const ; - virtual void FocusSuggestion( ); - virtual OUString GetCurrentSuggestion( ) const; + GetConversionFormat( ) const SAL_OVERRIDE ; + virtual void FocusSuggestion( ) SAL_OVERRIDE; + virtual OUString GetCurrentSuggestion( ) const SAL_OVERRIDE; }; class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog { DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) - virtual OUString GetWord(); - virtual sal_uInt16 GetLanguage() const; - virtual Window* GetWindow(); + virtual OUString GetWord() SAL_OVERRIDE; + virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE; + virtual Window* GetWindow() SAL_OVERRIDE; }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog { DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) - virtual void SelLeft(); - virtual void SelRight(); - virtual Window* GetWindow(); + virtual void SelLeft() SAL_OVERRIDE; + virtual void SelRight() SAL_OVERRIDE; + virtual Window* GetWindow() SAL_OVERRIDE; }; class FmShowColsDialog; class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog { DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog) - virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); + virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols) SAL_OVERRIDE; }; class SvxZoomDialog; class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog { DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog) - virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ); - virtual void HideButton( sal_uInt16 nBtnId ); - virtual const SfxItemSet* GetOutputItemSet() const ; + virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) SAL_OVERRIDE; + virtual void HideButton( sal_uInt16 nBtnId ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE ; }; @@ -205,22 +205,22 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog { public: DECL_ABSTDLG_BASE(AbstractSpellDialog_Impl, svx::SpellDialog) - virtual void SetLanguage( sal_uInt16 nLang ); - virtual bool Close(); - virtual void Invalidate(); - virtual Window* GetWindow(); - virtual SfxBindings& GetBindings(); + virtual void SetLanguage( sal_uInt16 nLang ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void Invalidate() SAL_OVERRIDE; + virtual Window* GetWindow() SAL_OVERRIDE; + virtual SfxBindings& GetBindings() SAL_OVERRIDE; }; class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress { DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress) - virtual void Update() ; - virtual void Sync() ; - virtual void SetFileType( const OUString& rType ) ; - virtual void SetDirectory( const INetURLObject& rURL ) ; - virtual PLinkStub GetLinkStubCleanUpHdl() ; + virtual void Update() SAL_OVERRIDE ; + virtual void Sync() SAL_OVERRIDE ; + virtual void SetFileType( const OUString& rType ) SAL_OVERRIDE ; + virtual void SetDirectory( const INetURLObject& rURL ) SAL_OVERRIDE ; + virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ; }; @@ -228,10 +228,10 @@ class TakeProgress; class AbstractTakeProgress_Impl : public AbstractTakeProgress { DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress) - virtual void Update() ; - virtual void Sync() ; - virtual void SetFile( const INetURLObject& rURL ) ; - virtual PLinkStub GetLinkStubCleanUpHdl() ; + virtual void Update() SAL_OVERRIDE ; + virtual void Sync() SAL_OVERRIDE ; + virtual void SetFile( const INetURLObject& rURL ) SAL_OVERRIDE ; + virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ; }; @@ -239,7 +239,7 @@ class TitleDialog; class AbstractTitleDialog_Impl : public AbstractTitleDialog { DECL_ABSTDLG_BASE(AbstractTitleDialog_Impl,TitleDialog) - virtual OUString GetTitle() const ; + virtual OUString GetTitle() const SAL_OVERRIDE ; }; @@ -249,16 +249,16 @@ class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog DECL_ABSTDLG_BASE( AbstractScriptSelectorDialog_Impl, SvxScriptSelectorDialog) - virtual OUString GetScriptURL() const; + virtual OUString GetScriptURL() const SAL_OVERRIDE; - virtual void SetRunLabel(); + virtual void SetRunLabel() SAL_OVERRIDE; }; class GalleryIdDialog; class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog { DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog) - virtual sal_uLong GetId() const ; + virtual sal_uLong GetId() const SAL_OVERRIDE ; }; @@ -266,11 +266,11 @@ class URLDlg; class AbstractURLDlg_Impl :public AbstractURLDlg { DECL_ABSTDLG_BASE(AbstractURLDlg_Impl,URLDlg) - virtual OUString GetURL() const; - virtual OUString GetAltText() const; - virtual OUString GetDesc() const; - virtual OUString GetTarget() const; - virtual OUString GetName() const; + virtual OUString GetURL() const SAL_OVERRIDE; + virtual OUString GetAltText() const SAL_OVERRIDE; + virtual OUString GetDesc() const SAL_OVERRIDE; + virtual OUString GetTarget() const SAL_OVERRIDE; + virtual OUString GetName() const SAL_OVERRIDE; }; class SvxHlinkDlgMarkWnd; @@ -278,15 +278,15 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd { DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd) virtual void Hide() SAL_OVERRIDE; - virtual bool IsVisible() const ; - virtual void Invalidate( sal_uInt16 nFlags = 0 ); - virtual void SetSizePixel( const Size& rNewSize ); - virtual Size GetSizePixel() const; - virtual bool MoveTo( Point aNewPos ) const; - virtual bool ConnectToDialog( bool bDoit = true ) const; - virtual void RefreshTree ( const OUString& aStrURL ); - virtual void SelectEntry ( const OUString& aStrMark ); - virtual sal_uInt16 SetError( sal_uInt16 nError) ; + virtual bool IsVisible() const SAL_OVERRIDE ; + virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + virtual Size GetSizePixel() const SAL_OVERRIDE; + virtual bool MoveTo( Point aNewPos ) const SAL_OVERRIDE; + virtual bool ConnectToDialog( bool bDoit = true ) const SAL_OVERRIDE; + virtual void RefreshTree ( const OUString& aStrURL ) SAL_OVERRIDE; + virtual void SelectEntry ( const OUString& aStrMark ) SAL_OVERRIDE; + virtual sal_uInt16 SetError( sal_uInt16 nError) SAL_OVERRIDE ; }; @@ -294,70 +294,70 @@ class SvxSearchSimilarityDialog; class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog { DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog) - virtual sal_uInt16 GetOther(); - virtual sal_uInt16 GetShorter(); - virtual sal_uInt16 GetLonger(); - virtual bool IsRelaxed(); + virtual sal_uInt16 GetOther() SAL_OVERRIDE; + virtual sal_uInt16 GetShorter() SAL_OVERRIDE; + virtual sal_uInt16 GetLonger() SAL_OVERRIDE; + virtual bool IsRelaxed() SAL_OVERRIDE; }; class SvxJSearchOptionsDialog; class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog { DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog) - virtual sal_Int32 GetTransliterationFlags() const; + virtual sal_Int32 GetTransliterationFlags() const SAL_OVERRIDE; }; class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog { DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog) - virtual void SetValidateFramePosLink( const Link& rLink ); - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE; + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog { DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog) - virtual void SetValidateFramePosLink( const Link& rLink ); - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE; + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class FmInputRecordNoDialog; class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog { DECL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl,FmInputRecordNoDialog) - virtual void SetValue(long nNew) ; - virtual long GetValue() const ; + virtual void SetValue(long nNew) SAL_OVERRIDE ; + virtual long GetValue() const SAL_OVERRIDE ; }; class SvxNewDictionaryDialog; class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog { DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary() SAL_OVERRIDE; }; class SvxNameDialog; class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog { DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) - virtual void GetName( OUString& rName ) ; - virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(const OString&) ; + virtual void GetName( OUString& rName ) SAL_OVERRIDE ; + virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ; + virtual void SetEditHelpId(const OString&) SAL_OVERRIDE ; //from class Window - virtual void SetHelpId( const OString& ) ; - virtual void SetText( const OUString& rStr ) ; + virtual void SetHelpId( const OString& ) SAL_OVERRIDE ; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ; private: Link aCheckNameHdl; DECL_LINK(CheckNameHdl, void *); @@ -369,8 +369,8 @@ class SvxObjectTitleDescDialog; class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog { DECL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl, SvxObjectNameDialog) - virtual void GetName(OUString& rName) ; - virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false); + virtual void GetName(OUString& rName) SAL_OVERRIDE ; + virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) SAL_OVERRIDE; private: Link aCheckNameHdl; @@ -380,89 +380,89 @@ private: class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog { DECL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl, SvxObjectTitleDescDialog) - virtual void GetTitle(OUString& rName); - virtual void GetDescription(OUString& rName); + virtual void GetTitle(OUString& rName) SAL_OVERRIDE; + virtual void GetDescription(OUString& rName) SAL_OVERRIDE; }; class SvxMessDialog; class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog { DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog) - virtual void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); + virtual void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ) SAL_OVERRIDE; }; class SvxMultiPathDialog; class AbstractSvxMultiPathDialog_Impl : public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl,SvxMultiPathDialog) - virtual OUString GetPath() const; - virtual void SetPath( const OUString& rPath ); - virtual void SetTitle( const OUString& rNewTitle ); + virtual OUString GetPath() const SAL_OVERRIDE; + virtual void SetPath( const OUString& rPath ) SAL_OVERRIDE; + virtual void SetTitle( const OUString& rNewTitle ) SAL_OVERRIDE; }; class SvxPathSelectDialog; class AbstractSvxPathSelectDialog_Impl : public AbstractSvxMultiPathDialog { DECL_ABSTDLG_BASE(AbstractSvxPathSelectDialog_Impl,SvxPathSelectDialog) - virtual OUString GetPath() const; - virtual void SetPath( const OUString& rPath ); - virtual void SetTitle( const OUString& rNewTitle ); + virtual OUString GetPath() const SAL_OVERRIDE; + virtual void SetPath( const OUString& rPath ) SAL_OVERRIDE; + virtual void SetTitle( const OUString& rNewTitle ) SAL_OVERRIDE; }; class SvxHpLinkDlg; class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg { DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg) - virtual Window* GetWindow(); - virtual bool QueryClose(); + virtual Window* GetWindow() SAL_OVERRIDE; + virtual bool QueryClose() SAL_OVERRIDE; }; class FmSearchDialog; class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog { DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog) - virtual void SetFoundHandler(const Link& lnk) ; - virtual void SetCanceledNotFoundHdl(const Link& lnk); - virtual void SetActiveField(const OUString& strField); + virtual void SetFoundHandler(const Link& lnk) SAL_OVERRIDE ; + virtual void SetCanceledNotFoundHdl(const Link& lnk) SAL_OVERRIDE; + virtual void SetActiveField(const OUString& strField) SAL_OVERRIDE; }; class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog { DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog) - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; }; class SvxAreaTabDialog; class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog { DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; // From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog { DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) - virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); - virtual bool IsCreateNew(); + virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; + virtual bool IsCreateNew() SAL_OVERRIDE; }; class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog { public: DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog ) - virtual void Insert( SotFormatStringId nFormat, const OUString & rFormatName ); - virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); + virtual void Insert( SotFormatStringId nFormat, const OUString & rFormatName ) SAL_OVERRIDE; + virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) SAL_OVERRIDE; virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, - const TransferableObjectDescriptor* pDesc=0 ); + const TransferableObjectDescriptor* pDesc=0 ) SAL_OVERRIDE; }; class AbstractLinksDialog_Impl : public SfxAbstractLinksDialog @@ -475,19 +475,19 @@ class SvxPostItDialog; class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog { DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog ) - virtual void SetText( const OUString& rStr ); //From class Window - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetPrevHdl( const Link& rLink ) ; - virtual void SetNextHdl( const Link& rLink ) ; - virtual void EnableTravel(bool bNext, bool bPrev) ; - virtual OUString GetNote() ; - virtual void SetNote(const OUString& rTxt) ; - virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) ; - virtual void DontChangeAuthor() ; - virtual void HideAuthor() ; - virtual void SetReadonlyPostIt(bool bDisable) ; - virtual bool IsOkEnabled() const; - virtual Window * GetWindow(); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; //From class Window + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual void SetPrevHdl( const Link& rLink ) SAL_OVERRIDE ; + virtual void SetNextHdl( const Link& rLink ) SAL_OVERRIDE ; + virtual void EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ; + virtual OUString GetNote() SAL_OVERRIDE ; + virtual void SetNote(const OUString& rTxt) SAL_OVERRIDE ; + virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) SAL_OVERRIDE ; + virtual void DontChangeAuthor() SAL_OVERRIDE ; + virtual void HideAuthor() SAL_OVERRIDE ; + virtual void SetReadonlyPostIt(bool bDisable) SAL_OVERRIDE ; + virtual bool IsOkEnabled() const SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; private: Link aNextHdl; Link aPrevHdl; @@ -500,17 +500,17 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod { DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog ) - virtual OUString GetPasswordToOpen() const; - virtual OUString GetPasswordToModify() const; - virtual bool IsRecommendToOpenReadonly() const; + virtual OUString GetPasswordToOpen() const SAL_OVERRIDE; + virtual OUString GetPasswordToModify() const SAL_OVERRIDE; + virtual bool IsRecommendToOpenReadonly() const SAL_OVERRIDE; }; //AbstractDialogFactory_Impl implementations class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ); - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ); + virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, @@ -518,174 +518,174 @@ public: virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, - sal_uInt32 nResId ); + sal_uInt32 nResId ) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId - ); - virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ); + ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, - const OUString *pUserButtonText=0 ); + const OUString *pUserButtonText=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, - const OUString *pUserButtonText=0 ); + const OUString *pUserButtonText=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, - SdrModel* pModel=0 ); + SdrModel* pModel=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, - const SfxItemSet& rSet); + const SfxItemSet& rSet) SAL_OVERRIDE; virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0 ); + sal_uInt16 nAnchorTypes = 0 ) SAL_OVERRIDE; virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, - SvxDistributeVertical eVer = SvxDistributeVerticalNone); + SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, - const SvObjectServerList* pList = 0 ); + const SvObjectServerList* pList = 0 ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand, - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ); + const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; + virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ) SAL_OVERRIDE; + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, - editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE; virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, - const OUString &rWord, sal_Int16 nLanguage ); + const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE; virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, const OUString &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, - SvxSpellWrapper* pWrapper ); + SvxSpellWrapper* pWrapper ) SAL_OVERRIDE; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ); + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) SAL_OVERRIDE; virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, - const SfxItemSet& rCoreSet); + const SfxItemSet& rCoreSet) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, const SfxItemSet& rCoreSet, - bool bEnableSelector = false) ; + bool bEnableSelector = false) SAL_OVERRIDE ; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, - sal_uInt16 nAnchorTypes = 0) ; + sal_uInt16 nAnchorTypes = 0) SAL_OVERRIDE ; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false - ); + ) SAL_OVERRIDE; virtual AbstractSpellDialog * CreateSvxSpellDialog( Window* pParent, SfxBindings* pBindings, - svx::SpellDialogChildWindow* pSpellChildWindow ); + svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ); + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, - const INetURLObject& rStartURL); - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ); + const INetURLObject& rStartURL) SAL_OVERRIDE; + virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) SAL_OVERRIDE; virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, - const OUString& rOldText); + const OUString& rOldText) SAL_OVERRIDE; virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, - GalleryTheme* pThm); + GalleryTheme* pThm) SAL_OVERRIDE; virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, ExchangeData* pData, - SfxItemSet* pItemSet); + SfxItemSet* pItemSet) SAL_OVERRIDE; virtual AbstractURLDlg * CreateURLDialog( Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, - TargetList& rTargetList ); - virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); + TargetList& rTargetList ) SAL_OVERRIDE; + virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, - const sal_uInt16* pWhRanges); + const sal_uInt16* pWhRanges) SAL_OVERRIDE; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, - sal_uInt16 nLonger); + sal_uInt16 nLonger) SAL_OVERRIDE; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, const SfxItemSet& rOptionsSet, - sal_Int32 nInitialFlags); - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ); + sal_Int32 nInitialFlags) SAL_OVERRIDE; + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) SAL_OVERRIDE; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, - sal_uInt32 nResId); + sal_uInt32 nResId) SAL_OVERRIDE; virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, - const OUString& rName, const OUString& rDesc ); + const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ); - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription); + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) SAL_OVERRIDE; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, - Image* pImg = NULL ); - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent); - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent); + Image* pImg = NULL ) SAL_OVERRIDE; + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) SAL_OVERRIDE; virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, SfxBindings* pBindings, - sal_uInt32 nResId); + sal_uInt32 nResId) SAL_OVERRIDE; virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link& lnkContextSupplier); + const Link& lnkContextSupplier) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, - const Graphic& rGraphic, RECT_POINT eLightSource); + const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, - const Graphic& rGraphic, sal_uInt16 nCount); + const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, - const Graphic& rGraphic, sal_uInt16 nCount); + const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, - const Graphic& rGraphic, double nRadius); + const Graphic& rGraphic, double nRadius) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, - bool bInvert); + bool bInvert) SAL_OVERRIDE; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, - bool bEnhanceEdges); + bool bEnhanceEdges) SAL_OVERRIDE; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, - const SdrView* pSdrView = NULL ); + const SdrView* pSdrView = NULL ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, - bool bHasObj = true ); + bool bHasObj = true ) SAL_OVERRIDE; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet, - bool bPrevNext = false ); + bool bPrevNext = false ) SAL_OVERRIDE; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); - virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(); + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; + virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() SAL_OVERRIDE; - virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ); - virtual DialogGetRanges GetDialogGetRangesFunc(); - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ); + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; + virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame - ); + ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, ::com::sun::star::uno::Any aException); + Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( Window* _pParent, @@ -693,20 +693,20 @@ public: const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent - ); + ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ); + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) ; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) SAL_OVERRIDE ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ); + Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index d09c76b81ea0..ed1357658df2 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -34,7 +34,7 @@ public: void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 8755912ce469..60268b705943 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -72,16 +72,16 @@ private: SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParentDialog();} protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SentenceEditWindow_Impl(Window* pParent, WinBits nBits); ~SentenceEditWindow_Impl(); - void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;} + void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); - void SetText( const OUString& rStr ); + void SetText( const OUString& rStr ) SAL_OVERRIDE; bool MarkNextError( bool bIgnoreCurrentError, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> ); void ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage); @@ -210,7 +210,7 @@ private: void SetTitle_Impl(LanguageType nLang); protected: - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; OUString getReplacementString() const; @@ -222,7 +222,7 @@ public: ~SpellDialog(); void SetLanguage( sal_uInt16 nLang ); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void InvalidateDialog(); }; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 59f4d3618506..dd275a06dc96 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -59,9 +59,9 @@ private: OUString GetCopyrightString(); protected: - virtual bool Close(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual bool Close() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; public: AboutDialog(Window* pParent); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index a0d6ee4df4bc..2998db5fbdc1 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -55,11 +55,11 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox { SfxAcceleratorConfigPage* m_pAccelConfigPage; - void KeyInput( const KeyEvent &rKEvt ); + void KeyInput( const KeyEvent &rKEvt ) SAL_OVERRIDE; protected: virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, - const Image&, SvLBoxButtonKind eButtonKind); + const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle) @@ -173,8 +173,8 @@ public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 2889de185e21..273b0a89d198 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -62,10 +62,10 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: explicit AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index fcca210d24e3..cf462facaca6 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -66,9 +66,9 @@ class OfaACorrCheckListBox : public SvSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); - virtual void HBarClick(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void SetTabs() SAL_OVERRIDE; + virtual void HBarClick() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; public: OfaACorrCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) @@ -113,9 +113,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -172,9 +172,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; // class AutoCorrEdit ---------------------------------------------------- @@ -196,7 +196,7 @@ class AutoCorrEdit : public Edit void SetSpaces(sal_Bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -265,12 +265,12 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - virtual void Resize(); - virtual void StateChanged(StateChangedType nStateChange); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); @@ -324,10 +324,10 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); }; @@ -390,9 +390,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; // class OfaAutoCompleteTabPage --------------------------------------------- @@ -410,7 +410,7 @@ public: { } void SetPage(OfaAutoCompleteTabPage *pPage) { m_pPage = pPage; } - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; private: @@ -440,9 +440,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void CopyToClipboard() const; DECL_LINK(DeleteHdl, void *); @@ -507,9 +507,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 59f6082519e1..bd247f38587c 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -51,10 +51,10 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; /// Shift-ListBox activation void ShowSelector(); @@ -64,9 +64,9 @@ public: void ShowParaControl(sal_Bool bCharOnly = sal_False); void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 0b3139a6da73..c4393bd9e1f7 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -31,7 +31,7 @@ public: SvxBorderBackgroundDlg(Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; private: bool m_bEnableBackgroundSelector; ///< for Border/Background diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 7f1a251c5213..76b19281280e 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -47,14 +47,14 @@ public: const SfxItemSet& rAttrSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rCoreAttrs ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void HideShadowControls(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 33484e2c35d0..0b17e126368e 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -66,7 +66,7 @@ private: public: SvxConfigDialog( Window*, const SfxItemSet* ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); }; @@ -138,7 +138,7 @@ public: com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > m_aSeparatorSeq; - Image GetImage( const OUString& rCommandURL ); + Image GetImage( const OUString& rCommandURL ) SAL_OVERRIDE; virtual bool HasURL( const OUString& aURL ) = 0; virtual bool HasSettings() = 0; @@ -201,12 +201,12 @@ public: ~MenuSaveInData(); /// methods inherited from SaveInData - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasURL( const OUString& URL ) { (void)URL; return false; } - bool HasSettings() { return m_xMenuSettings.is(); } - void Reset(); - bool Apply(); + SvxEntries* GetEntries() SAL_OVERRIDE; + void SetEntries( SvxEntries* ) SAL_OVERRIDE; + bool HasURL( const OUString& URL ) SAL_OVERRIDE { (void)URL; return false; } + bool HasSettings() SAL_OVERRIDE { return m_xMenuSettings.is(); } + void Reset() SAL_OVERRIDE; + bool Apply() SAL_OVERRIDE; }; class SvxConfigEntry @@ -324,22 +324,22 @@ public: SvxMenuEntriesListBox(Window*, SvxConfigPage*); ~SvxMenuEntriesListBox(); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong& ); + SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong&); + SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvTreeListEntry* ); + TransferDataContainer&, SvTreeListEntry* ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; }; class SvxConfigPage : public SfxTabPage @@ -436,8 +436,8 @@ public: bool MoveEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - bool FillItemSet( SfxItemSet& ); - void Reset( const SfxItemSet& ); + bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual bool DeleteSelectedContent() = 0; virtual void DeleteSelectedTopLevel() = 0; @@ -474,11 +474,11 @@ private: DECL_LINK( AddCommandsHdl, Button * ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); - void Init(); - void UpdateButtonStates(); - short QueryReset(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void Init() SAL_OVERRIDE; + void UpdateButtonStates() SAL_OVERRIDE; + short QueryReset() SAL_OVERRIDE; + bool DeleteSelectedContent() SAL_OVERRIDE; + void DeleteSelectedTopLevel() SAL_OVERRIDE; public: SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); @@ -490,7 +490,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ); + bool docConfig ) SAL_OVERRIDE; }; class SvxMainMenuOrganizerDialog : public ModalDialog @@ -534,8 +534,8 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox protected: - virtual void CheckButtonHdl(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void CheckButtonHdl() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void BuildCheckBoxButtonImages( SvLBoxButtonData* ); Image GetSizedImage( VirtualDevice& aDev, const Size& aNewSize, const Image& aImage ); @@ -554,12 +554,12 @@ public: { return m_aCheckBoxImageSizePixel; } virtual sal_Bool NotifyMoving( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ); + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&); + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; - void KeyInput( const KeyEvent& rKeyEvent ); + void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; }; class SvxToolbarConfigPage : public SvxConfigPage @@ -575,11 +575,11 @@ private: DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); DECL_LINK( MoveHdl, Button * ); - void UpdateButtonStates(); - short QueryReset(); - void Init(); - bool DeleteSelectedContent(); - void DeleteSelectedTopLevel(); + void UpdateButtonStates() SAL_OVERRIDE; + short QueryReset() SAL_OVERRIDE; + void Init() SAL_OVERRIDE; + bool DeleteSelectedContent() SAL_OVERRIDE; + void DeleteSelectedTopLevel() SAL_OVERRIDE; public: SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); @@ -589,7 +589,7 @@ public: bool bFront = false, bool bAllowDuplicates = true ); - void MoveEntry( bool bMoveUp ); + void MoveEntry( bool bMoveUp ) SAL_OVERRIDE; SaveInData* CreateSaveInData( const ::com::sun::star::uno::Reference < @@ -597,7 +597,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ); + bool docConfig ) SAL_OVERRIDE; }; class ToolbarSaveInData : public SaveInData @@ -651,12 +651,12 @@ public: < ::com::sun::star::frame::XFrame > xFrame, const OUString& rResourceURL, sal_Int32 nStyle ); - SvxEntries* GetEntries(); - void SetEntries( SvxEntries* ); - bool HasSettings(); - bool HasURL( const OUString& rURL ); - void Reset(); - bool Apply(); + SvxEntries* GetEntries() SAL_OVERRIDE; + void SetEntries( SvxEntries* ) SAL_OVERRIDE; + bool HasSettings() SAL_OVERRIDE; + bool HasURL( const OUString& rURL ) SAL_OVERRIDE; + void Reset() SAL_OVERRIDE; + bool Apply() SAL_OVERRIDE; }; class SvxNewToolbarDialog : public ModalDialog diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 2bd263a71485..2a993cfc2cfa 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -108,7 +108,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox SfxStylesInfo_Impl* pStylesInfo; DECL_LINK( TimerHdl, Timer* ); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: SfxConfigFunctionListBox(Window*, WinBits nStyle); @@ -159,7 +159,7 @@ class SfxConfigGroupListBox : public SvTreeListBox SfxStylesInfo_Impl* pStylesInfo; protected: - virtual void RequestingChildren( SvTreeListEntry *pEntry); + virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; virtual sal_Bool Expand( SvTreeListEntry* pParent ); public: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 68456aba4863..db0136976981 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -66,7 +66,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -146,8 +146,8 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: ~SvxCharNamePage(); @@ -155,8 +155,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -165,7 +165,7 @@ public: void SetPreviewBackgroundToCharacter(); void DisableControls( sal_uInt16 nDisable ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharEffectsPage ---------------------------------------------- @@ -228,20 +228,20 @@ private: public: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharPositionPage --------------------------------------------- @@ -306,19 +306,19 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharTwoLinesPage --------------------------------------------- @@ -349,18 +349,18 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CHARDLG_HXX diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index f4f595dcdb6c..16b2ddbd05a7 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -66,12 +66,12 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; /* Derived from SfxSingleTabDialog, in order to be informed about diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 7ac6aae78357..fa6141beb831 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -44,15 +44,15 @@ public: ~SvxShowText(); void SetFont( const Font& rFont ); - void SetText( const OUString& rText ); + void SetText( const OUString& rText ) SAL_OVERRIDE; void SetCentered(bool bCenter) { mbCenter = bCenter; } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; private: long mnY; @@ -110,7 +110,7 @@ public: OUString GetCharacters() const; - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 0d59adc0d737..909e2f1516f2 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -131,7 +131,7 @@ public: inline void SetActiveField(const OUString& strField); protected: - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void Init(const OUString& strVisibleFields, const OUString& strInitialText); // only to be used out of the constructors diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index b97e32e635ec..fbff91315809 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -68,7 +68,7 @@ private: sal_Bool bRecursive ); virtual ~SearchThread(); - virtual void execute(); + virtual void execute() SAL_OVERRIDE; public: @@ -96,8 +96,8 @@ public: DECL_LINK( CleanUpHdl, void* ); - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; void SetFileType( const OUString& rType ) { m_pFtSearchType->SetText( rType ); } void SetDirectory( const INetURLObject& rURL ) { m_pFtSearchDir->SetText( GetReducedString( rURL, 30 ) ); } }; @@ -111,7 +111,7 @@ private: TokenList_impl& mrTakenList; virtual ~TakeThread(); - virtual void execute(); + virtual void execute() SAL_OVERRIDE; public: @@ -141,8 +141,8 @@ public: DECL_LINK( CleanUpHdl, void* ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; }; class ActualizeProgress : public ModalDialog @@ -162,7 +162,7 @@ public: ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); ~ActualizeProgress() {}; - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; class TitleDialog : public ModalDialog @@ -195,7 +195,7 @@ class GalleryThemeProperties : public SfxTabDialog sal_uInt16 m_nGeneralPageId; sal_uInt16 m_nFilesPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: GalleryThemeProperties(Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); @@ -213,8 +213,8 @@ private: FixedText* m_pFtMSShowChangeDate; ExchangeData* pData; - virtual void Reset( const SfxItemSet& ) {} - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {} + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; public: @@ -262,8 +262,8 @@ class TPGalleryThemeProperties : public SfxTabPage ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; - virtual void Reset( const SfxItemSet& /*rSet*/ ) {} - virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) { return true; } + virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {} + virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) SAL_OVERRIDE { return true; } OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f4d6b4f3fecb..05ed2b5ef57f 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -42,9 +42,9 @@ private: double mfScaleX; double mfScaleY; - virtual void Paint(const Rectangle& rRect); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void ScaleImageToFit(); @@ -103,7 +103,7 @@ public: GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } }; @@ -123,7 +123,7 @@ public: GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); } long GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); } sal_Bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } @@ -144,7 +144,7 @@ public: GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, sal_Bool bInvert ); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } sal_Bool IsInvert() const { return mpCbxInvert->IsChecked(); } }; @@ -160,7 +160,7 @@ private: public: GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const { return sal::static_int_cast< sal_uInt16 >(mpMtrSepia->GetValue()); @@ -179,7 +179,7 @@ public: GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) mpNumPoster->GetValue() ); } }; @@ -191,8 +191,8 @@ class EmbossControl : public SvxRectCtl { private: Link maModifyHdl; - virtual void MouseButtonDown( const MouseEvent& rEvt ); - virtual Size GetOptimalSize() const; + virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; public: EmbossControl(Window* pParent) : SvxRectCtl(pParent) {} @@ -208,7 +208,7 @@ public: GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); - virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ); + virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; RECT_POINT GetLightSource() const { return mpCtlLight->GetActualRP(); } }; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 051ead52ed17..295b8aec444f 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -46,7 +46,7 @@ public : SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; @@ -72,14 +72,14 @@ private: DECL_LINK (ClickCloseHdl_Impl, void * ); protected: - virtual bool Close(); - virtual void Move(); + virtual bool Close() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; public: SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); ~SvxHpLinkDlg (); - virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); + virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; sal_uInt16 SetPage( SvxHyperlinkItem* pItem ); void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index fe56efe3d416..b0b8cd8d3d94 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -61,7 +61,7 @@ private: void SetLinks (); protected: - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -69,8 +69,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 1ab46e07d47a..660e3c79eb9a 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -48,7 +48,7 @@ public: const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); // Window - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; sal_Int32 GetTransliterationFlags() const; }; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 29b4b399e9b2..6ae9dbc37a68 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -67,10 +67,10 @@ private: sal_Int32 mnPos; sal_Bool mbAreaTP; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; protected: - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; DECL_LINK( CancelHdlImpl, void * ); void SavePalettes(); @@ -168,15 +168,15 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet&); - virtual void Reset(const SfxItemSet&); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet); - virtual void PointChanged(Window* pWindow, RECT_POINT eRP); + virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; + virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; } - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; /************************************************************************/ @@ -280,11 +280,11 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -297,7 +297,7 @@ public: void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; } void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } @@ -345,18 +345,18 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; void DisablePage( sal_Bool bIn ) { bDisable = bIn; } }; @@ -423,11 +423,11 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -499,13 +499,13 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetHatchingList( XHatchListRef pHtchLst) @@ -519,7 +519,7 @@ public: void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; /************************************************************************/ @@ -585,13 +585,13 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; } @@ -612,7 +612,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual Window* GetParentLabeledBy( const Window* pLabeled ) const SAL_OVERRIDE; }; /************************************************************************/ @@ -720,11 +720,11 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual XPropertyListRef GetPropertyList( XPropertyListType t ); virtual void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); @@ -741,7 +741,7 @@ public: void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; virtual bool IsModified() { diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index f75ae743bd6e..e7954531b159 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -53,10 +53,10 @@ private: sal_Int32 nPosLineEndLb; sal_Bool mbAreaTP; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; protected: - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; DECL_LINK( CancelHdlImpl, void * ); void SavePalettes(); @@ -208,15 +208,15 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } @@ -232,8 +232,8 @@ public: void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } - virtual void PageCreated (SfxAllItemSet aSet); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; /*************************************************************************/ @@ -304,11 +304,11 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } @@ -319,7 +319,7 @@ public: void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; /*************************************************************************/ @@ -374,11 +374,11 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } @@ -390,8 +390,8 @@ public: void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Resize(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 5c4a590f273f..bb79b8971977 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -95,9 +95,9 @@ namespace svx static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; @@ -131,7 +131,7 @@ namespace svx DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); ~DatabaseRegistrationDialog(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index bf6207840b7c..e2d6b076e2c3 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -47,9 +47,9 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); - virtual bool FillItemSet(SfxItemSet&); - virtual void Reset(const SfxItemSet&); - virtual void PointChanged(Window* pWindow, RECT_POINT eRP); + virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index bf45d41d0594..7d06e1476552 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -35,9 +35,9 @@ class SvxCropExample : public Window public: SvxCropExample( Window* pPar, WinBits nStyle ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } void SetTop( long nVal ) { aTopLeft.X() = nVal; } @@ -107,15 +107,15 @@ class SvxGrfCropPage : public SfxTabPage void CalcZoom(); void CalcMinMaxBorder(); void GraphicHasChanged(sal_Bool bFound); - virtual void ActivatePage(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; Size GetGrfOrigSize( const Graphic& ) const; public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); - virtual bool FillItemSet( SfxItemSet &rSet ); - virtual void Reset( const SfxItemSet &rSet ); - virtual int DeactivatePage( SfxItemSet *pSet ); + virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 933b67935e8f..46b888740e03 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -51,7 +51,7 @@ namespace svx SuggestionSet( Window* pParent ); virtual ~SuggestionSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void ClearSet(); }; @@ -74,15 +74,15 @@ namespace svx OUString GetEntry( sal_uInt16 nPos ) const; OUString GetSelectEntry() const; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - virtual void Activate(); - virtual void Deactivate(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Command( const CommandEvent& rCEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; DECL_LINK( SelectSuggestionHdl, Control* ); @@ -264,7 +264,7 @@ namespace svx ScrollBar& _rScrollBar, SuggestionEdit* _pPrev, SuggestionEdit* _pNext ); virtual ~SuggestionEdit(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 4b2c6e39fe53..f4658b3eeda0 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -31,12 +31,12 @@ private: SvHeaderTabListBox maListBox; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: MacroEventListBox( Window* pParent, WinBits nStyle ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; SvHeaderTabListBox& GetListBox() { diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index ecfd833cbd53..c84c4eb5aba0 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -47,10 +47,10 @@ private: Image GetImage( sal_uInt16 nId ); protected: - void FillDlgFields(const OUString& rStrURL); + void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ); + SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet); @@ -58,10 +58,10 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual sal_Bool AskApply (); - virtual void DoApply (); + virtual sal_Bool AskApply () SAL_OVERRIDE; + virtual void DoApply () SAL_OVERRIDE; - virtual void SetInitFocus(); + virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 6ec8e73528bf..fb6bd3220ddd 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -62,12 +62,12 @@ private: EPathType GetPathType ( const OUString& rStrPath ); protected: - void FillDlgFields(const OUString& rStrURL); + void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ); - virtual sal_Bool ShouldOpenMarkWnd () {return mbMarkWndOpen;} - virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;} + SvxLinkInsertMode& eMode ) SAL_OVERRIDE; + virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} + virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} OUString GetCurrentURL (); public: @@ -76,9 +76,9 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( const OUString& aStrMark ); + virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; - virtual void SetInitFocus(); + virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index c6f396897a38..a834b1e75f6c 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -71,12 +71,12 @@ private: void RefreshMarkWindow(); protected: - virtual void FillDlgFields(const OUString& rStrURL); + virtual void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ); - virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} - virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;} + SvxLinkInsertMode& eMode ) SAL_OVERRIDE; + virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} + virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: SvxHyperlinkInternetTp ( Window *pParent, const SfxItemSet& rItemSet); @@ -84,9 +84,9 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetMarkStr ( const OUString& aStrMark ); + virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; - virtual void SetInitFocus(); + virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index eb1ef445452f..cb89fba23be7 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -51,10 +51,10 @@ private: OUString CreateAbsoluteURL() const; protected: - virtual void FillDlgFields(const OUString& rStrURL); + virtual void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, - SvxLinkInsertMode& eMode ); + SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rItemSet); @@ -62,7 +62,7 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual void SetInitFocus(); + virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index ecc027190462..2844ed4361a8 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -44,7 +44,7 @@ private: public: SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; @@ -78,7 +78,7 @@ protected: void ClearTree(); int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL ); - virtual void Move (); + virtual void Move () SAL_OVERRIDE; DECL_LINK (ClickApplyHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * ); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 88ea7643a417..4e83a658202b 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -58,13 +58,13 @@ public: class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper { protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Select(); - virtual void Modify(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); @@ -140,18 +140,18 @@ public: virtual void DoApply (); virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); - virtual void Reset( const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& rItemSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; sal_Bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False ); - virtual void ActivatePage(); - virtual void DeactivatePage(); - virtual sal_Bool QueryClose(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual void DeactivatePage() SAL_OVERRIDE; + virtual sal_Bool QueryClose() SAL_OVERRIDE; protected: virtual sal_Bool ShouldOpenMarkWnd(); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index cae65414844e..1a41b0bcc7a7 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -37,7 +37,7 @@ public: HyphenEdit(Window* pParent); protected: - virtual void KeyInput(const KeyEvent &rKEvt); + virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; }; class SvxHyphenWordDialog : public SfxModalDialog diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 9a90c9d69088..47dea0f577fc 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -119,8 +119,8 @@ public : virtual sal_Bool IsReadOnly() const; virtual sal_Bool QueryClose(); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; class IconChoiceDialog : public ModalDialog @@ -192,8 +192,8 @@ public : const EIconChoicePos ePos = PosLeft, const SfxItemSet * pItemSet = 0 ); ~IconChoiceDialog (); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; // interface SvxIconChoiceCtrlEntry* AddTabPage( @@ -217,7 +217,7 @@ public : const HelpButton& GetHelpButton() const { return aHelpBtn; } HelpButton& GetHelpButton() { return aHelpBtn; } - short Execute(); + short Execute() SAL_OVERRIDE; void Start( sal_Bool bShow = sal_True ); sal_Bool QueryClose(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index b18569d6a1b3..b5f7244d5eef 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -79,17 +79,17 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pEdFilepath->GetText(); } sal_Bool IsLinked() const { return m_pCbFilelink->IsChecked(); } - sal_Bool IsCreateNew() const + sal_Bool IsCreateNew() const SAL_OVERRIDE { return m_pRbNewObject->IsChecked(); } public: SvInsertOleDlg( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; /// get replacement for the iconified embedded object and the mediatype of the replacement - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; }; class SvInsertPlugInDialog : public InsertObjectDialog_Impl @@ -109,7 +109,7 @@ public: SvInsertPlugInDialog(Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); ~SvInsertPlugInDialog(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl @@ -143,7 +143,7 @@ public: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); SfxInsertFloatingFrameDialog( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_INSDLG_HXX diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 235d26de6cce..65932047dc04 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -44,10 +44,10 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog public: SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); - virtual short Execute(void); + virtual short Execute(void) SAL_OVERRIDE; - virtual bool isInsertBefore() const; - virtual sal_uInt16 getInsertCount() const; + virtual bool isInsertBefore() const SAL_OVERRIDE; + virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 9d3e81334880..2dc5c13447bb 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -78,13 +78,13 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void FillValueSet(); }; @@ -101,7 +101,7 @@ private: Link aValidateLink; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SvxCaptionTabDialog(Window* pParent, const SdrView* pView, diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index b64753689d98..3ccba230f07e 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -64,16 +64,16 @@ public: void SetMacroTbl( const SvxMacroTableDtor& rTbl ); virtual void ScriptChanged(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; using TabPage::ActivatePage; // FIXME WTF is this nonsense? - virtual void ActivatePage( const SfxItemSet& ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void LaunchFillGroup(); // --------- inherit from the base ------------- - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - bool IsReadOnly() const; + bool IsReadOnly() const SAL_OVERRIDE; }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 8b12c305d8d7..cdb5ab8e5be8 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -84,13 +84,13 @@ public: void InitResources(); void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ); + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void DisplayAppEvents( bool appEvents); void SetReadOnly( sal_Bool bSet ); - bool IsReadOnly() const; + bool IsReadOnly() const SAL_OVERRIDE; }; class SvxMacroTabPage : public _SvxMacroTabPage diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index e52c5ae933b5..e17a5e060d48 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -70,14 +70,14 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 390145fd189f..37d1ce46bd28 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -35,11 +35,11 @@ private: public: SvxNewTableDialog( Window* pWindow ); - virtual short Execute(void); + virtual short Execute(void) SAL_OVERRIDE; virtual void Apply(void); - virtual sal_Int32 getRows() const; - virtual sal_Int32 getColumns() const; + virtual sal_Int32 getRows() const SAL_OVERRIDE; + virtual sal_Int32 getColumns() const SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 4c4fc827c6de..14370f7d7605 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -51,9 +51,9 @@ private: void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER); @@ -74,9 +74,9 @@ public: const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; void SetInfoItem( const SvxNumberInfoItem& rItem ); void SetNumberFormatList( const SvxNumberInfoItem& rItem ) @@ -84,8 +84,8 @@ public: void SetOkHdl( const Link& rOkHandler ); void HideLanguage(sal_Bool nFlag=sal_True); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; private: SvxNumberFormatTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 28c1f8664fb4..5ed30f272b9c 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -48,7 +48,7 @@ class SvxNumberingPreview : public Window sal_uInt16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER); @@ -113,10 +113,10 @@ class SvxSingleNumPickTabPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -149,13 +149,13 @@ class SvxBulletPickTabPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;} - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; #define NUM_VALUSET_COUNT 16 @@ -192,15 +192,15 @@ class SvxNumPickTabPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName) { sNumCharFmtName = rCharName; sBulletCharFmtName = rBulName;} - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -237,10 +237,10 @@ class SvxBitmapPickTabPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -349,10 +349,10 @@ class SvxNumOptionsTabPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) { @@ -363,7 +363,7 @@ class SvxNumOptionsTabPage : public SfxTabPage ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;} void SetModified(sal_Bool bRepaint = sal_True); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; /** Get the numberings provided by the i18n framework (CTL, Asian, ...) and add them to the listbox. Extended numbering schemes present in the @@ -449,17 +449,17 @@ public: const SfxItemSet& rSet); ~SvxNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); void SetMetric(FieldUnit eSet); void SetModified(sal_Bool bRepaint = sal_True); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index b0e41676c9bf..efb49dc7661a 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -59,8 +59,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index c72f687e94f4..b6319aaff393 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -91,7 +91,7 @@ class SvxDictEdit : public Edit void SetSpaces(sal_Bool bSet) {bSpaces = bSet;} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; // class SvxEditDictionaryDialog ----------------------------------------- diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 3010389172ec..47c1a5acc7de 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -151,8 +151,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void HideGroups( sal_uInt16 nGrp ); }; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index caa21eb8d2d6..30dc82d6b988 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -75,9 +75,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index a06efff172a4..29bf0b3fe6ab 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -173,16 +173,16 @@ class SvxPageDescPage : public SfxTabPage SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); protected: - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rOutSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; virtual ~SvxPageDescPage(); @@ -191,7 +191,7 @@ public: { ePaperStart = eStart, ePaperEnd = eEnd; } void SetCollectionList(const std::vector<OUString> &aList); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_PAGE_HXX diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 911f05a18a5e..5b384a18b553 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -93,7 +93,7 @@ private: DECL_LINK( AutoHdl_Impl, CheckBox* ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: @@ -102,8 +102,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetPageWidth( sal_uInt16 nPageWidth ); @@ -113,7 +113,7 @@ public: void EnableAutoFirstLine(); void EnableAbsLineDist(long nMinTwip); void EnableNegativeMode(); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; virtual ~SvxStdParagraphTabPage(); }; @@ -157,17 +157,17 @@ class SvxParaAlignTabPage : public SfxTabPage virtual ~SvxParaAlignTabPage(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void EnableJustifyExt(); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxExtParagraphTabPage ------------------------------------------ @@ -195,13 +195,13 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void DisablePageBreak(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -252,7 +252,7 @@ private: DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -275,8 +275,8 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 2497498660a8..0ea9b5470e43 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -33,9 +33,9 @@ private: Point m_aCurMousePoint; protected: - virtual void SetTabs(); - virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void SetTabs() SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& _rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; public: SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index bb3fa60f0916..03d5dfe5ae2f 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -68,9 +68,9 @@ private: protected: void ExpandTree( SvTreeListEntry* pRootEntry ); - virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual void ExpandedHdl(); - virtual bool ExpandingHdl(); + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual void ExpandedHdl() SAL_OVERRIDE; + virtual bool ExpandingHdl() SAL_OVERRIDE; public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, @@ -180,7 +180,7 @@ public: SvxScriptOrgDialog( Window* pParent, const OUString& language ); ~SvxScriptOrgDialog(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; @@ -199,7 +199,7 @@ public: ~SvxScriptErrorDialog(); - short Execute(); + short Execute() SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_SCRIPTDLG_HXX diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 76153a6ca53f..9aafbabbfe06 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -43,7 +43,7 @@ protected: public: SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 5c1c604056b8..01cc6d87496f 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -97,7 +97,7 @@ friend class SvxConfigGroupListBox; SvTreeListEntry* m_pDraggingEntry; DECL_LINK(TimerHdl, void *); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: SvxConfigFunctionListBox(Window* pParent, WinBits nStyle); @@ -109,12 +109,12 @@ public: void FunctionSelected(); // drag n drop methods - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvTreeListEntry* ); + TransferDataContainer&, SvTreeListEntry* ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ); + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; }; class SvxConfigGroupListBox : public SvTreeListBox @@ -156,7 +156,7 @@ private: ); protected: - virtual void RequestingChildren( SvTreeListEntry *pEntry); + virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; virtual sal_Bool Expand( SvTreeListEntry* pParent ); public: diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 40b76d041729..94c3b983f985 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -36,7 +36,7 @@ class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandard long mnMaxVertical; long mnMaxHorizontal; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SvxSplitTableDlg(Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); @@ -44,11 +44,11 @@ public: DECL_LINK( ClickHdl, Button * ); - virtual bool IsHorizontal() const; - virtual bool IsProportional() const; - virtual long GetCount() const; + virtual bool IsHorizontal() const SAL_OVERRIDE; + virtual bool IsProportional() const SAL_OVERRIDE; + virtual long GetCount() const SAL_OVERRIDE; - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index a3c26e229f7e..0d1f4c141f6c 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -33,7 +33,7 @@ public: virtual ~SvxSearchFormatDialog(); protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; private: FontList* m_pFontList; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 4c4a23b8de3d..7b6379794d02 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -128,10 +128,10 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void EnableAnchorTypes(sal_uInt16 nAnchorEnable); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index b6fb6c1f8ddb..18707784b374 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -53,13 +53,13 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void DisableControls( const sal_uInt16 nFlag ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -117,7 +117,7 @@ private: DECL_LINK( GetFillCharHdl_Impl, Edit* ); DECL_LINK( GetDezCharHdl_Impl, Edit* ); - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_TABSTPGE_HXX diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index a7fd3391e4b1..c41f243dfc9d 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -79,8 +79,8 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void Construct(); }; @@ -97,7 +97,7 @@ class SvxTextTabDialog : public SfxTabDialog private: const SdrView* pView; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index be3e1ae39e29..aafdaa41febd 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -80,14 +80,14 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void PageCreated(SfxAllItemSet aSet); + virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_TEXTATTR_HXX diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index b84112e2d5d9..16a9801f924b 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -50,7 +50,7 @@ public: void init(SvxThesaurusDialog *pDialog); // ComboBox - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; }; class AlternativesExtraData @@ -95,8 +95,8 @@ public: void SetExtraData( const SvTreeListEntry *pEntry, const AlternativesExtraData &rData ); AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; class ReplaceEdit : public Edit @@ -114,9 +114,9 @@ public: void init(Button *pBtn) { m_pBtn = pBtn; } // Edit - virtual void Modify(); - virtual void SetText( const OUString& rStr ); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); + virtual void Modify() SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; }; class SvxThesaurusDialog : public SvxStandardDialog @@ -156,7 +156,7 @@ public: bool UpdateAlternativesBox_Impl(); void LookUp( const OUString &rText ); void LookUp_Impl(); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SvxThesaurusDialog( Window* pParent, diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 6ae053d8cd01..a2df27ec97ef 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -56,7 +56,7 @@ private: sal_uInt16 nAnchorCtrls; Link aValidateLink; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: @@ -151,18 +151,18 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; void DisableResize(); void DisableProtect(); @@ -206,13 +206,13 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -250,13 +250,13 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); + virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 3f60dfdaab9c..2cc04ba42abd 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -189,7 +189,7 @@ private: VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); void InsertNodes( const VectorOfNodes& rNodeList ); - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; void SetPaneSize(Window *pPane); protected: @@ -200,8 +200,8 @@ protected: DECL_LINK( HintHdl_Impl, Timer * ); void SelectHdl_Impl(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual short Execute(); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; public: OfaTreeOptionsDialog( Window* pParent, @@ -287,8 +287,8 @@ public: virtual ~ExtensionsTabPage(); - virtual void ActivatePage(); - virtual void DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual void DeactivatePage() SAL_OVERRIDE; void ResetPage(); void SavePage(); diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index be7ee6442f54..836b2f61389f 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -83,8 +83,8 @@ public: const SvxChartColorTable& GetDefaultColors(); void SetDefaultColors( const SvxChartColorTable& aCol ); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; }; @@ -97,8 +97,8 @@ public: SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& ); SvxChartColorTableItem( const SvxChartColorTableItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SvxChartOptions* pOpts ) const; const SvxChartColorTable & GetColorList() const ; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index b00df7aad0d6..3f5b16260c62 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -47,9 +47,9 @@ namespace offapp public: DriverListControl(Window* _pParent); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; void Update(const DriverPoolingSettings& _rSettings); - virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const SAL_OVERRIDE; // the handler will be called with a DriverPoolingSettings::const_iterator as parameter, // or NULL if no valid current row exists @@ -66,22 +66,22 @@ namespace offapp sal_Bool isModified() const; protected: - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; + virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const SAL_OVERRIDE; - virtual bool SeekRow( long nRow ); - virtual bool SaveModified(); + virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual bool SaveModified() SAL_OVERRIDE; - virtual bool IsTabAllowed(bool _bForward) const; + virtual bool IsTabAllowed(bool _bForward) const SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void CursorMoved(); + virtual void CursorMoved() SAL_OVERRIDE; protected: - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; private: diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 27fef9a06487..10f0003b3421 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -54,11 +54,11 @@ namespace offapp static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); protected: - virtual bool Notify( NotifyEvent& _rNEvt ); + virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& _rSet); - virtual void Reset(const SfxItemSet& _rSet); - virtual void ActivatePage( const SfxItemSet& _rSet); + virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; protected: DECL_LINK( OnEnabledDisabled, const CheckBox* ); diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index f9e8a4e55fa5..59a4a8d6e47b 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -87,8 +87,8 @@ namespace offapp DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index c3fb36806cd0..687b87a6695c 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -76,8 +76,8 @@ namespace svx DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const DatabaseRegistrations& getRegistrations() const { return m_aRegistrations; } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index bbc891555c9e..e299ed225bd5 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -36,9 +36,9 @@ class SvxFontSubstCheckListBox : public SvSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Resize(); + virtual void SetTabs() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; public: SvxFontSubstCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits) @@ -96,8 +96,8 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 2fb211d0c5eb..d9c355e62802 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -35,7 +35,7 @@ public: SvLBoxString( pEntry, nFlags, rTxt ) {} virtual void Paint( - const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index d495ba319763..e591a438a052 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -30,7 +30,7 @@ namespace svx public: OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nBits); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; }; } // svx #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index e9a11d4a37b2..55c614e628e0 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -35,8 +35,8 @@ public: , bNumericOnly(false) {} - virtual void KeyInput( const KeyEvent& rKeyEvent ); - virtual Size GetOptimalSize() const; + virtual void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; //void setBehaviour( bool bNumeric, int nLengthLimit); }; @@ -65,7 +65,7 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ); virtual bool FillItemSet( /* SfxItemSet& rSet*/ ); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class CuiAboutConfigValueDialog : public ModalDialog diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 400d3ebe1f74..1cdc671a053f 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -46,8 +46,8 @@ public: virtual ~SvxAccessibilityOptionsTabPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index 13c8490383a9..3890ce1e26ba 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -41,9 +41,9 @@ public: ~SvxBasicIDEOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index d91ebb6b6149..b15926782ef9 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -64,8 +64,8 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f29162d19ebb..79ec9b289363 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -266,11 +266,11 @@ private: void SetAppearance(); private: - virtual void Command (CommandEvent const& rCEvt); - virtual void DataChanged (DataChangedEvent const& rDCEvt); + virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; + virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; bool IsGroupVisible (Group) const; }; @@ -838,9 +838,9 @@ class ColorConfigCtrl_Impl : public VclVBox DECL_LINK(ColorHdl, ColorListBox*); DECL_LINK(ControlFocusHdl, Control*); - virtual bool PreNotify (NotifyEvent& rNEvt); - virtual void Command (CommandEvent const& rCEvt); - virtual void DataChanged (DataChangedEvent const& rDCEvt); + virtual bool PreNotify (NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; + virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; public: ColorConfigCtrl_Impl(Window* pParent); ~ColorConfigCtrl_Impl(); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 4c6216cf9f27..580b535a694c 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -52,11 +52,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ); - virtual void FillUserData(); + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 32ae80c86873..326718bee03f 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -48,8 +48,8 @@ public: virtual ~SvxCTLOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 9ee8a71c36a4..fe01a122a480 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -46,8 +46,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -62,9 +62,9 @@ class OfaMSFilterTabPage2 : public SfxTabPage SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: - virtual void SetTabs(); - virtual void HBarClick(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void SetTabs() SAL_OVERRIDE; + virtual void HBarClick() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; public: MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = 0) @@ -95,8 +95,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 8c28f7ac31a4..cd5fcd2ded2f 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -62,7 +62,7 @@ private: DECL_LINK( OnFileDlgToggled, void* ); #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -70,8 +70,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; // class OfaViewTabPage -------------------------------------------------- @@ -125,8 +125,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; struct LanguageConfig_Impl; @@ -167,8 +167,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 2aa122f930ff..1bab77f331ed 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -59,8 +59,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 759c68152165..bd37cc5c6aee 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1114,8 +1114,8 @@ public: MailerProgramCfg_Impl(); virtual ~MailerProgramCfg_Impl(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; }; /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 5b7243f85171..e02f3735e0a9 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -49,9 +49,9 @@ public: : Edit(pParent, nStyle) , bOnlyNumeric(false) {} - virtual void KeyInput(const KeyEvent& rKEvent); - virtual void Modify(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual void KeyInput(const KeyEvent& rKEvent) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; // class SvxProxyTabPage ------------------------------------------------- @@ -105,8 +105,8 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -119,7 +119,7 @@ public: :ListBox(pParent, rResId) {} protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; // class SvxSecurityTabPage --------------------------------------------- @@ -170,13 +170,13 @@ private: virtual ~SvxSecurityTabPage(); protected: - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; class MozPluginTabPage : public SfxTabPage @@ -195,8 +195,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -220,8 +220,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index be81c0c49baf..41a82f6f436f 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -120,7 +120,7 @@ public: aStaticTabs[4] = aStaticTabs[3] + nVersionWidth; SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } - virtual void Resize() + virtual void Resize() SAL_OVERRIDE { svx::SvxRadioButtonListBox::Resize(); setColSizes(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 6a438f739b50..1cf0f9657e84 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -109,9 +109,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; // class SvxJavaParameterDlg --------------------------------------------- @@ -141,7 +141,7 @@ public: SvxJavaParameterDlg( Window* pParent ); ~SvxJavaParameterDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; ::com::sun::star::uno::Sequence< OUString > GetParameters() const; void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams ); diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 6262375083e3..b6fc3a39a3fe 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -66,8 +66,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; sal_Bool IsSaveOptions() const { return bSaveOptions; } void EnableSaveOptions( sal_Bool bVal ) { bSaveOptions = bVal; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index acf6a1269c22..0eaf290583cc 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -284,7 +284,7 @@ public: const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void BrwStringDic_Impl::Paint( @@ -464,7 +464,7 @@ public: const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void BrwString_Impl::Paint( diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index cba5303e1b36..276cc1ea94d1 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -53,7 +53,7 @@ private: inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -61,8 +61,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index b1a1485c6c7b..810c1af3e3b6 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -76,8 +76,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 53e049161aa9..6b3b261358ad 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -56,9 +56,9 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index db323d061b90..e7197f5ff375 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -32,10 +32,10 @@ public: static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet ); /// Apply the settings ([OK] button). - virtual bool FillItemSet( SfxItemSet &rSet ); + virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE; /// Reset to default settings ([Revert] button). - virtual void Reset( const SfxItemSet &rSet ); + virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; private: /// Handle the Persona selection diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 287c1a525e5b..fa5d8901f0ef 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -256,8 +256,8 @@ public: MailMergeCfg_Impl(); virtual ~MailMergeCfg_Impl(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; sal_Bool IsEmailSupported() const {return bIsEmailSupported;} diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 38c06a51110a..44dc8e3bbefa 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -38,7 +38,7 @@ namespace svx void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits); void setColWidths(); void Resort( bool bForced ); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; }; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 81d76d76e2d0..f681ee7a1fba 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -309,7 +309,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void OfaImpBrwString::Paint( diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5eea3323ad67..c1d035991c9e 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -187,9 +187,9 @@ public: void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b6255128812e..47f77950d706 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -44,9 +44,9 @@ public: virtual ~LineItemWrapper() {} - virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const + virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const SAL_OVERRIDE { return rItem.GetLine(); } - virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const + virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const SAL_OVERRIDE { rItem.SetLine( pLine ); } }; @@ -58,11 +58,11 @@ public: inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {} - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual const editeng::SvxBorderLine* GetControlValue() const; - virtual void SetControlValue( const editeng::SvxBorderLine* pLine ); + virtual const editeng::SvxBorderLine* GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) SAL_OVERRIDE; private: FrameBorderType meBorder; /// The line this wrapper works with. @@ -115,8 +115,8 @@ public: MetricField& rMfLeft, MetricField& rMfRight, MetricField& rMfTop, MetricField& rMfBottom ); - virtual SvxMarginItem GetControlValue() const; - virtual void SetControlValue( SvxMarginItem aItem ); + virtual SvxMarginItem GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( SvxMarginItem aItem ) SAL_OVERRIDE; private: sfx::Int16MetricFieldWrapper maLeftWrp; @@ -209,8 +209,8 @@ class ShadowControlsWrapper : public sfx::MultiControlWrapper< SvxShadowItem > public: explicit ShadowControlsWrapper( ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor ); - virtual SvxShadowItem GetControlValue() const; - virtual void SetControlValue( SvxShadowItem aItem ); + virtual SvxShadowItem GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( SvxShadowItem aItem ) SAL_OVERRIDE; private: ShadowPosWrapper maPosWrp; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index afaff7c771c8..e1cebfdf46fb 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -52,7 +52,7 @@ public: { } - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; } void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } |