summaryrefslogtreecommitdiff
path: root/svtools/source/contnr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /svtools/source/contnr
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'svtools/source/contnr')
-rw-r--r--svtools/source/contnr/contentenumeration.hxx2
-rw-r--r--svtools/source/contnr/fileview.cxx22
-rw-r--r--svtools/source/contnr/imivctl1.cxx4
-rw-r--r--svtools/source/contnr/templwin.hxx14
-rw-r--r--svtools/source/contnr/treelistbox.cxx8
5 files changed, 25 insertions, 25 deletions
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 2a00714ecb04..1c6b4ae504b2 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -255,7 +255,7 @@ namespace svt
EnumerationResult enumerateFolderContent();
// Thread overridables
- virtual void execute();
+ virtual void execute() SAL_OVERRIDE;
private:
sal_Bool implGetDocTitle( const OUString& _rTargetURL, OUString& _rRet ) const;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index cabdd0e484ca..1d1588a17900 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -123,7 +123,7 @@ namespace
CallbackTimer( ITimeoutHandler* _pHandler ) : m_pTimeoutHandler( _pHandler ) { }
protected:
- virtual void SAL_CALL onShot();
+ virtual void SAL_CALL onShot() SAL_OVERRIDE;
};
@@ -189,16 +189,16 @@ private:
bool Kill( const OUString& rURL );
protected:
- virtual bool DoubleClickHdl();
- virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const;
+ virtual bool DoubleClickHdl() SAL_OVERRIDE;
+ virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const SAL_OVERRIDE;
public:
ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags );
~ViewTabListBox_Impl();
- virtual void Resize();
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
void ClearAll();
HeaderBar* GetHeaderBar() const { return mpHeaderBar; }
@@ -212,8 +212,8 @@ public:
DECL_LINK(ResetQuickSearch_Impl, void *);
- virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry );
+ virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
+ virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) SAL_OVERRIDE;
};
// class HashedEntry --------------------------------------------------
@@ -427,7 +427,7 @@ public:
virtual ~NameTranslator_Impl();
// IContentTitleTranslation
- virtual sal_Bool GetTranslation( const OUString& rOriginalName, OUString& rTranslatedName ) const;
+ virtual sal_Bool GetTranslation( const OUString& rOriginalName, OUString& rTranslatedName ) const SAL_OVERRIDE;
void SetActualFolder( const INetURLObject& rActualFolder );
const OUString* GetTransTableFileName() const;
@@ -537,11 +537,11 @@ protected:
protected:
// IEnumerationResultHandler overridables
- virtual void enumerationDone( ::svt::EnumerationResult eResult );
+ virtual void enumerationDone( ::svt::EnumerationResult eResult ) SAL_OVERRIDE;
void implEnumerationSuccess();
// ITimeoutHandler
- virtual void onTimeout( CallbackTimer* _pInstigator );
+ virtual void onTimeout( CallbackTimer* _pInstigator ) SAL_OVERRIDE;
};
inline void SvtFileView_Impl::EnableContextMenu( bool bEnable )
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 87c8c2461db1..3813e798a884 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -85,8 +85,8 @@ public:
const Link& rNotifyEditEnd );
~IcnViewEdit_Impl();
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual bool PreNotify( NotifyEvent& rNEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
sal_Bool EditingCanceled() const { return bCanceled; }
void StopEditing( sal_Bool bCancel = sal_False );
sal_Bool IsGrabFocus() const { return bGrabFocus; }
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index a38f9de2fdd7..bd47b9688398 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -51,7 +51,7 @@ public:
SvtDummyHeaderBar_Impl( Window* pParent );
~SvtDummyHeaderBar_Impl();
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
};
// class SvtIconWindow_Impl ----------------------------------------------
@@ -75,7 +75,7 @@ public:
SvtIconWindow_Impl( Window* pParent );
~SvtIconWindow_Impl();
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
inline long GetMaxTextLength() const { return nMaxTextLength; }
inline void SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); }
@@ -131,7 +131,7 @@ public:
SvtFileViewWindow_Impl( SvtTemplateWindow* pParent );
~SvtFileViewWindow_Impl();
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
inline void SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); }
inline void SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); }
@@ -197,7 +197,7 @@ public:
SvtFrameWindow_Impl( Window* pParent );
~SvtFrameWindow_Impl();
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
void OpenFile( const OUString& rURL, sal_Bool bPreview, sal_Bool bIsTemplate, sal_Bool bAsTemplate );
void ToggleView( sal_Bool bDocInfo );
@@ -229,7 +229,7 @@ private:
OUString aFolderTitle;
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
DECL_LINK(IconClickHdl_Impl, void *);
DECL_LINK(FileSelectHdl_Impl, void *);
@@ -248,8 +248,8 @@ private:
void UpdateIcons();
protected:
- virtual bool PreNotify( NotifyEvent& rNEvt );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
SvtTemplateWindow( Window* pParent );
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 78dd3e783ffe..8114e455709e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -62,8 +62,8 @@ class MyEdit_Impl : public Edit
SvInplaceEdit2* pOwner;
public:
MyEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner );
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void LoseFocus();
+ virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual void LoseFocus() SAL_OVERRIDE;
};
class MyMultiEdit_Impl : public MultiLineEdit
@@ -71,8 +71,8 @@ class MyMultiEdit_Impl : public MultiLineEdit
SvInplaceEdit2* pOwner;
public:
MyMultiEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner );
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void LoseFocus();
+ virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual void LoseFocus() SAL_OVERRIDE;
};
MyEdit_Impl::MyEdit_Impl( Window* pParent, SvInplaceEdit2* _pOwner ) :