diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 10:26:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 10:29:45 +0200 |
commit | 5e090212b1a33a9ff2b1d0fd65909dad2f87758a (patch) | |
tree | 6074f8a5a1642a121f7d2e9ad2b0014f9e0cdb8f | |
parent | 9e2e8bb5e6c5a7df376f6ada90703f59c95f19d6 (diff) |
-Werror,-Winconsistent-missing-override
Change-Id: I5f7ab4c7eb106fc7bc0d93abc78ab9168c6867a6
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 50 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 42 |
3 files changed, 47 insertions, 47 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index ec34e966159f..15a249f08a28 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -109,7 +109,7 @@ class FileViewContainer : public vcl::Window m_pFocusWidgets[m_nCurrentFocus]->GrabFocus(); } - virtual bool Notify( NotifyEvent& rNEvt ) + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE { if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 05f9ca102f84..df9106eaf883 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -69,39 +69,39 @@ public: // SvtFileDialog_Base - virtual SvtFileView* GetView(); - - virtual void SetHasFilename( bool ); - virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); - virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const; - virtual void SetStandardDir( const OUString& rStdDir ); - virtual const OUString& GetStandardDir() const; - virtual void SetPath( const OUString& rNewURL ); - virtual const OUString& GetPath(); - virtual std::vector<OUString> GetPathList() const; - virtual bool ContentIsFolder( const OUString& rURL ); - - virtual void AddFilter( const OUString& rFilter, const OUString& rType ); + virtual SvtFileView* GetView() SAL_OVERRIDE; + + virtual void SetHasFilename( bool ) SAL_OVERRIDE; + virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const SAL_OVERRIDE; + virtual void SetStandardDir( const OUString& rStdDir ) SAL_OVERRIDE; + virtual const OUString& GetStandardDir() const SAL_OVERRIDE; + virtual void SetPath( const OUString& rNewURL ) SAL_OVERRIDE; + virtual const OUString& GetPath() SAL_OVERRIDE; + virtual std::vector<OUString> GetPathList() const SAL_OVERRIDE; + virtual bool ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE; + + virtual void AddFilter( const OUString& rFilter, const OUString& rType ) SAL_OVERRIDE; virtual void AddFilterGroup( const OUString& _rFilter, - const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ); - virtual OUString GetCurFilter() const; - virtual void SetCurFilter( const OUString& rFilter ); + const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE; + virtual OUString GetCurFilter() const SAL_OVERRIDE; + virtual void SetCurFilter( const OUString& rFilter ) SAL_OVERRIDE; - virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier ); + virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier ) SAL_OVERRIDE; - virtual void EnableAutocompletion( bool ); + virtual void EnableAutocompletion( bool ) SAL_OVERRIDE; - virtual sal_Int32 getTargetColorDepth(); - virtual sal_Int32 getAvailableWidth(); - virtual sal_Int32 getAvailableHeight(); + virtual sal_Int32 getTargetColorDepth() SAL_OVERRIDE; + virtual sal_Int32 getAvailableWidth() SAL_OVERRIDE; + virtual sal_Int32 getAvailableHeight() SAL_OVERRIDE; - virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ); + virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE; - virtual bool getShowState(); + virtual bool getShowState() SAL_OVERRIDE; virtual Control* getControl( sal_Int16 nControlId, bool bLabelControl = false ) const SAL_OVERRIDE; - virtual void enableControl( sal_Int16 nControlId, bool bEnable ); - virtual OUString getCurFilter( ) const; + virtual void enableControl( sal_Int16 nControlId, bool bEnable ) SAL_OVERRIDE; + virtual OUString getCurFilter( ) const SAL_OVERRIDE; private: ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_context; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 414da3ef3eac..57482107fdc7 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -180,21 +180,21 @@ public: void FileSelect(); void FilterSelect(); - void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); - const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const; - void SetStandardDir( const OUString& rStdDir ); - const OUString& GetStandardDir() const; - std::vector<OUString> GetPathList() const; // for MultiSelection + void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const SAL_OVERRIDE; + void SetStandardDir( const OUString& rStdDir ) SAL_OVERRIDE; + const OUString& GetStandardDir() const SAL_OVERRIDE; + std::vector<OUString> GetPathList() const SAL_OVERRIDE; // for MultiSelection void AddFilter( const OUString& rFilter, - const OUString& rType ); + const OUString& rType ) SAL_OVERRIDE; void AddFilterGroup( const OUString& _rFilter, - const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ); + const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE; - void SetCurFilter( const OUString& rFilter ); - OUString GetCurFilter() const; + void SetCurFilter( const OUString& rFilter ) SAL_OVERRIDE; + OUString GetCurFilter() const SAL_OVERRIDE; sal_uInt16 GetFilterCount() const; const OUString& GetFilterName( sal_uInt16 nPos ) const; @@ -204,19 +204,19 @@ public: void PrevLevel_Impl(); void OpenURL_Impl( const OUString& rURL ); - SvtFileView* GetView(); + SvtFileView* GetView() SAL_OVERRIDE; void InitSize(); void UpdateControls( const OUString& rURL ); - void EnableAutocompletion( bool _bEnable = true ); + void EnableAutocompletion( bool _bEnable = true ) SAL_OVERRIDE; - void SetFileCallback( ::svt::IFilePickerListener *pNotifier ) { _pFileNotifier = pNotifier; } + void SetFileCallback( ::svt::IFilePickerListener *pNotifier ) SAL_OVERRIDE { _pFileNotifier = pNotifier; } - sal_Int32 getTargetColorDepth(); - sal_Int32 getAvailableWidth(); - sal_Int32 getAvailableHeight(); - void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ); - bool getShowState(); + sal_Int32 getTargetColorDepth() SAL_OVERRIDE; + sal_Int32 getAvailableWidth() SAL_OVERRIDE; + sal_Int32 getAvailableHeight() SAL_OVERRIDE; + void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE; + bool getShowState() SAL_OVERRIDE; bool isAutoExtensionEnabled(); OUString getCurrentFileText( ) const; @@ -230,16 +230,16 @@ public: static void displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode ); // inline - inline void SetPath( const OUString& rNewURL ); - inline void SetHasFilename( bool bHasFilename ); - inline const OUString& GetPath(); + inline void SetPath( const OUString& rNewURL ) SAL_OVERRIDE; + inline void SetHasFilename( bool bHasFilename ) SAL_OVERRIDE; + inline const OUString& GetPath() SAL_OVERRIDE; inline void SetDefaultExt( const OUString& rExt ); inline void EraseDefaultExt( sal_Int32 _nIndex = 0 ); inline const OUString& GetDefaultExt() const; inline Image GetButtonImage( sal_uInt16 _nButtonId ) const { return m_aImages.GetImage( _nButtonId ); } - bool ContentIsFolder( const OUString& rURL ) { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); } + bool ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); } bool ContentHasParentFolder( const OUString& rURL ); bool ContentCanMakeFolder( const OUString& rURL ); bool ContentGetTitle( const OUString& rURL, OUString& rTitle ); |