diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /shell/source/unix | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'shell/source/unix')
| -rw-r--r-- | shell/source/unix/exec/shellexec.hxx | 8 | ||||
| -rw-r--r-- | shell/source/unix/sysshell/recently_used_file_handler.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx index 90c5b042bbd7..c32002ae2635 100644 --- a/shell/source/unix/exec/shellexec.hxx +++ b/shell/source/unix/exec/shellexec.hxx @@ -46,20 +46,20 @@ public: virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 6add8d488c2d..5f36496a2480 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -232,13 +232,13 @@ namespace /* private */ { virtual void start_element( const string_t& /*raw_name*/, const string_t& local_name, - const xml_tag_attribute_container_t& /*attributes*/) SAL_OVERRIDE + const xml_tag_attribute_container_t& /*attributes*/) override { if ((local_name == TAG_RECENT_ITEM) && (NULL == item_)) item_ = new recently_used_item; } - virtual void end_element(const string_t& /*raw_name*/, const string_t& local_name) SAL_OVERRIDE + virtual void end_element(const string_t& /*raw_name*/, const string_t& local_name) override { // check for end tags w/o start tag if( local_name != TAG_RECENT_FILES && NULL == item_ ) @@ -260,16 +260,16 @@ namespace /* private */ { current_element_.clear(); } - virtual void characters(const string_t& character) SAL_OVERRIDE + virtual void characters(const string_t& character) override { if (character != "\n") current_element_ += character; } - virtual void ignore_whitespace(const string_t& /*whitespaces*/) SAL_OVERRIDE + virtual void ignore_whitespace(const string_t& /*whitespaces*/) override {} - virtual void comment(const string_t& /*comment*/) SAL_OVERRIDE + virtual void comment(const string_t& /*comment*/) override {} private: recently_used_item* item_; |