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 /jvmfwk | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx | 8 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx index f4683d5aace9..e753b873beb5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx @@ -35,13 +35,13 @@ public: static rtl::Reference<VendorBase> createInstance(); - virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE; + virtual char const* const* getRuntimePaths(int * size) override; - virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE; + virtual char const* const* getLibraryPaths(int* size) override; virtual bool initialize( - std::vector<std::pair<OUString, OUString> > props) SAL_OVERRIDE; - virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE; + std::vector<std::pair<OUString, OUString> > props) override; + virtual int compareVersions(const OUString& sSecond) const override; }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx index d95a9a48afd1..16a08f225e77 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx @@ -34,9 +34,9 @@ public: static rtl::Reference<VendorBase> createInstance(); - virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE; - virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE; - virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE; + virtual char const* const* getRuntimePaths(int * size) override; + virtual char const* const* getLibraryPaths(int* size) override; + virtual int compareVersions(const OUString& sSecond) const override; }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx index 1d63794cc265..7da3c7ba8b1a 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx @@ -33,10 +33,10 @@ public: static rtl::Reference<VendorBase> createInstance(); - virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE; - virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE; + virtual char const* const* getRuntimePaths(int * size) override; + virtual char const* const* getLibraryPaths(int* size) override; - virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE; + virtual int compareVersions(const OUString& sSecond) const override; }; } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index f5b89caa9bb0..eb2d5130ce0c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -333,7 +333,7 @@ class AsynchReader: public salhelper::Thread virtual ~AsynchReader() {} - void execute() SAL_OVERRIDE; + void execute() override; public: AsynchReader(oslFileHandle & rHandle); |