diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-28 12:40:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-29 14:55:11 +0200 |
| commit | 0dd2e602e5c1b46e82abc6051677aeaab1d265b8 (patch) | |
| tree | 7f7a1cbc9cb87c38c732d4691129bf81dc1d04ff /shell/inc | |
| parent | 8b12c98ec7ec0b5ba20c28890ee63803fb9518d5 (diff) | |
Drop check for Windows versions we don't support
Since we dropped support of Vista and below in master toward 6.0,
those checks are needless. Removing the code that only worked in
older versions, and streamlining the resulting code.
Also, use kernel32.dll version for Windows version, instead of
deprecated GetVersionEx, and inconvenient VersionHelpers. Since both
GetVersion(Ex) and VersionHelpers (based on VerifyVersionInfo) are
subject to manifest-based behavior since Windows 8.1, this move will
hopefully result in more reliable OS version detection.
Change-Id: I3edd8fc1843e64b6a65bd3a126be6a085511f13c
Reviewed-on: https://gerrit.libreoffice.org/42905
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/utilities.hxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/shell/inc/utilities.hxx b/shell/inc/utilities.hxx index eb6c289d5023..22f785d3ce62 100644 --- a/shell/inc/utilities.hxx +++ b/shell/inc/utilities.hxx @@ -64,12 +64,6 @@ std::wstring UTF8ToWString(const std::string& String); std::wstring GetResString(int ResId); -/** Returns whether we are running - on Windows XP or not -*/ -bool is_windows_xp_or_above(); - - /** helper function to judge if the string is only has spaces. @returns <TRUE>if the provided string contains only but at least one space |