[Libreoffice-commits] core.git: setup_native/source

[Jesús Corrius]

 setup_native/source/win32/customactions/regactivex/regactivex.cxx |   12 ----------
 1 file changed, 12 deletions(-)

New commits:
commit a03b1876c7b334acc26a41b4d8ca6eead07cfa1f
Author: Jesús Corrius <jcorrius at gmail.com>
Date:   Mon Sep 2 16:30:41 2013 +0200

    We don't support Win9x anymore, remove legacy code
    
    Change-Id: I12afdc1c25bb09d20fd0698831642b953e08bb63

diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 7be03a2..b25602d 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -71,12 +71,6 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
 //----------------------------------------------------------
 void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
-    // For Win98/WinME the values should be written to the local machine
-    OSVERSIONINFO       aVerInfo;
-    aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
-    if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
-        InstallForAllUser = TRUE;
-
     HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
     if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
     {
@@ -104,12 +98,6 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
 //----------------------------------------------------------
 void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
-    // For Win98/WinME the values should be written to the local machine
-    OSVERSIONINFO       aVerInfo;
-    aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
-    if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
-        InstallForAllUser = TRUE;
-
     HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
     if( !( hModule <= ( HINSTANCE )HINSTANCE_ERROR ) )
     {