diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 17:05:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 17:05:07 +0000 |
| commit | 27973e334a0fdbc8712bdcb1c693b26717923a1e (patch) | |
| tree | 919c5ea9bec9bba050b3a4e661fe25d47e07556d /fpicker/source/win32/misc/WinImplHelper.cxx | |
| parent | 6d2505eb901c07159107c97ec66830bbec840121 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'fpicker/source/win32/misc/WinImplHelper.cxx')
| -rw-r--r-- | fpicker/source/win32/misc/WinImplHelper.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 54db5d78bfcf..c7f2999fa159 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: WinImplHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hro $ $Date: 2002-08-14 15:38:20 $ + * last change: $Author: hr $ $Date: 2003-03-25 18:05:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,16 +118,11 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; bool SAL_CALL IsWindowsVersion(unsigned int PlatformId, unsigned int MajorVersion, int MinorVersion = -1) { - OSVERSIONINFOEXA osvi; - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(osvi); - if(!GetVersionExA((OSVERSIONINFOA*)&osvi)) - { - // if OSVERSIONINFOEX doesn't work - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - if(!GetVersionEx((OSVERSIONINFOA*)&osvi)) - return false; - } + if(!GetVersionEx(&osvi)) + return false; bool bRet = (PlatformId == osvi.dwPlatformId) && (MajorVersion == osvi.dwMajorVersion); |