summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx2
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);