diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:13:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-02 15:13:16 +0000 |
| commit | 5f57a5a1709f215476720500e4496159e62377da (patch) | |
| tree | f53426a2d9ee240e648e91590ab2f5d69af1afb7 /shell | |
| parent | f990aeeb868b5e4c1238685873f808d885380cdd (diff) | |
INTEGRATION: CWS vistaready01 (1.6.22); FILE MERGED
2006/12/08 12:45:41 lla 1.6.22.1: #i72391# version check wrong
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/util/utilities.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index efea45cf5772..be8401a0f71c 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -4,9 +4,9 @@ * * $RCSfile: utilities.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:47:18 $ + * last change: $Author: hr $ $Date: 2007-01-02 16:13:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,13 +117,20 @@ std::wstring GetResString(int ResId) //--------------------------------- /** */ -bool is_windows_xp() +bool is_windows_xp_or_above() { OSVERSIONINFO osvi; ZeroMemory(&osvi, sizeof(osvi)); osvi.dwOSVersionInfoSize = sizeof(osvi); GetVersionEx(&osvi); - return (5 == osvi.dwMajorVersion && 1 == osvi.dwMinorVersion); + + // LLA: check for windows xp or above (Vista) + if (osvi.dwMajorVersion > 5 || + (5 == osvi.dwMajorVersion && osvi.dwMinorVersion >= 1)) + { + return true; + } + return false; } //--------------------------------- |