diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 21:51:04 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-20 21:56:12 +0300 |
commit | b30f91c58419e90a789f79a1391b13f2064997ab (patch) | |
tree | b4c7f218f879ff821de898ade0724acc7bb9e2d2 /fpicker/source/win32/misc/WinImplHelper.cxx | |
parent | f1c4c90a5bb54acd01befe2f77c5173ab3814949 (diff) |
Drop Win9x stuff
Diffstat (limited to 'fpicker/source/win32/misc/WinImplHelper.cxx')
-rw-r--r-- | fpicker/source/win32/misc/WinImplHelper.cxx | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 301a5bc9e6bc..d51f29b17a49 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -73,25 +73,6 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; // Windows ME VER_PLATFORM_WIN32_WINDOWS 4 90 //------------------------------------------------------------ -bool SAL_CALL IsWindowsVersion(unsigned int PlatformId, unsigned int MajorVersion, int MinorVersion = -1) -{ - OSVERSIONINFO osvi; - osvi.dwOSVersionInfoSize = sizeof(osvi); - - if(!GetVersionEx(&osvi)) - return false; - - bool bRet = (PlatformId == osvi.dwPlatformId) && - (MajorVersion == osvi.dwMajorVersion); - - if (MinorVersion > -1) - bRet = bRet && - (sal::static_int_cast< unsigned int >(MinorVersion) == - osvi.dwMinorVersion); - - return bRet; -} - //------------------------------------------------------------ // determine if we are running under Vista or newer OS //------------------------------------------------------------ @@ -115,81 +96,6 @@ bool SAL_CALL IsWindowsVistaOrNewer() } //------------------------------------------------------------ -// determine if we are running under Windows 7 -//------------------------------------------------------------ - -bool SAL_CALL IsWindows7() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_NT, 6, 1); -} - -//------------------------------------------------------------ -// determine if we are running under Windows Vista -//------------------------------------------------------------ - -bool SAL_CALL IsWindowsVista() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_NT, 6, 0); -} - -//------------------------------------------------------------ -// determine if we are running under Windows XP -//------------------------------------------------------------ - -bool SAL_CALL IsWindowsXP() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_NT, 5, 1); -} - -//------------------------------------------------------------ -// determine if we are running under Windows 2000 -//------------------------------------------------------------ - -bool SAL_CALL IsWindows2000() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_NT, 5, 0); -} - -//------------------------------------------------------------ -// -//------------------------------------------------------------ - -bool SAL_CALL IsWindows98() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_WINDOWS, 4, 10); -} - -//------------------------------------------------------------ -// -//------------------------------------------------------------ - -bool SAL_CALL IsWindowsME() -{ - return IsWindowsVersion(VER_PLATFORM_WIN32_WINDOWS, 4, 90); -} - -//------------------------------------------------------------ -// -//------------------------------------------------------------ - -bool SAL_CALL IsWindows2000Platform() -{ - // POST: return true if we are at least on Windows 2000 - - // WRONG!: return IsWindowsVersion(VER_PLATFORM_WIN32_NT, 5); - - OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(osvi)); - osvi.dwOSVersionInfoSize = sizeof(osvi); - GetVersionEx(&osvi); - if ( osvi.dwMajorVersion >= 5 ) - { - return true; - } - return false; -} - -//------------------------------------------------------------ // //------------------------------------------------------------ |