diff options
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/win32/filepicker/FPentry.cxx | 3 | ||||
-rw-r--r-- | fpicker/source/win32/misc/WinImplHelper.cxx | 30 | ||||
-rw-r--r-- | fpicker/source/win32/misc/WinImplHelper.hxx | 2 |
3 files changed, 0 insertions, 35 deletions
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 5eaf4d00c023..f5ce7ba45e12 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -44,9 +44,6 @@ static Reference< XInterface > SAL_CALL createInstance( { Reference< XInterface > xDlg; - if (!IsWindowsVistaOrNewer()) - std::abort(); // not supported - xDlg.set(static_cast<XFilePicker2*>( new ::fpicker::win32::vista::VistaFilePicker(rServiceManager))); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index d31dd622a8df..09de0484e134 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -24,10 +24,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifdef _WIN32_WINNT_WINBLUE -#include <VersionHelpers.h> -#endif - using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -52,32 +48,6 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; // Windows ME VER_PLATFORM_WIN32_WINDOWS 4 90 -// determine if we are running under Vista or newer OS - -bool SAL_CALL IsWindowsVistaOrNewer() -{ -// the Win32 SDK 8.1 deprecates GetVersionEx() -#ifdef _WIN32_WINNT_WINBLUE - return IsWindowsVistaOrGreater(); -#else - OSVERSIONINFO osvi; - osvi.dwOSVersionInfoSize = sizeof(osvi); - - if(!GetVersionEx(&osvi)) - return false; - - bool bRet = (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId) && - (osvi.dwMajorVersion >= 6); - - bRet = bRet && - (osvi.dwMinorVersion >= - sal::static_int_cast< unsigned int >(0)); - - return bRet; -#endif -} - - void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar, OUStringBuffer& aBuffer ) { OSL_ASSERT( aLabel.getLength( ) ); diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx index 9102dbfd4dd3..eee2900dc08c 100644 --- a/fpicker/source/win32/misc/WinImplHelper.hxx +++ b/fpicker/source/win32/misc/WinImplHelper.hxx @@ -37,8 +37,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> -bool SAL_CALL IsWindowsVistaOrNewer(); - // converts a soffice label to a windows label // the following rules for character replacements // will be done: |