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 /svtools/source/dialogs | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svtools/source/dialogs')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 32 | ||||
| -rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index b0e383fa4ce0..bf1b4fe51d58 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -139,15 +139,15 @@ public: ); // IAssigmentData overridables - virtual OUString getDatasourceName() const SAL_OVERRIDE; - virtual OUString getCommand() const SAL_OVERRIDE; + virtual OUString getDatasourceName() const override; + virtual OUString getCommand() const override; - virtual bool hasFieldAssignment(const OUString& _rLogicalName) SAL_OVERRIDE; - virtual OUString getFieldAssignment(const OUString& _rLogicalName) SAL_OVERRIDE; - virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) SAL_OVERRIDE; + virtual bool hasFieldAssignment(const OUString& _rLogicalName) override; + virtual OUString getFieldAssignment(const OUString& _rLogicalName) override; + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) override; - virtual void setDatasourceName(const OUString& _rName) SAL_OVERRIDE; - virtual void setCommand(const OUString& _rCommand) SAL_OVERRIDE; + virtual void setDatasourceName(const OUString& _rName) override; + virtual void setCommand(const OUString& _rCommand) override; }; @@ -268,20 +268,20 @@ public: virtual ~AssignmentPersistentData(); // IAssigmentData overridables - virtual OUString getDatasourceName() const SAL_OVERRIDE; - virtual OUString getCommand() const SAL_OVERRIDE; + virtual OUString getDatasourceName() const override; + virtual OUString getCommand() const override; - virtual bool hasFieldAssignment(const OUString& _rLogicalName) SAL_OVERRIDE; - virtual OUString getFieldAssignment(const OUString& _rLogicalName) SAL_OVERRIDE; - virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) SAL_OVERRIDE; + virtual bool hasFieldAssignment(const OUString& _rLogicalName) override; + virtual OUString getFieldAssignment(const OUString& _rLogicalName) override; + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) override; - virtual void setDatasourceName(const OUString& _rName) SAL_OVERRIDE; - virtual void setCommand(const OUString& _rCommand) SAL_OVERRIDE; + virtual void setDatasourceName(const OUString& _rName) override; + virtual void setCommand(const OUString& _rCommand) override; - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override; private: - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; void clearFieldAssignment(const OUString& _rLogicalName); }; diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 3deeb8b0995a..0ff1340f85bb 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -51,7 +51,7 @@ public: btnNo_->SetClickHdl(LINK(this, RestartDialog, hdlNo)); } virtual ~RestartDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { reason_.clear(); btnYes_.clear(); |