[Libreoffice-commits] .: sal/osl

Jesús Corrius jcorrius at kemper.freedesktop.org
Mon Nov 7 08:42:02 PST 2011


 sal/osl/w32/signal.cxx |   21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

New commits:
commit c8d0a37c0b29dcb5a21cd28560520295ed3c59b8
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Fri Nov 4 12:40:26 2011 +0100

    Remove obsolete IsWin95A function

diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 659d66e..6b59a1d 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -228,25 +228,6 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 /* SignalHandlerFunction    */
 /*****************************************************************************/
 
-static BOOL WINAPI IsWin95A(void)
-{
-    OSVERSIONINFO   ovi;
-
-    ZeroMemory( &ovi, sizeof(ovi) );
-    ovi.dwOSVersionInfoSize = sizeof(ovi);
-
-    if ( GetVersionEx( &ovi ) )
-        /* See MSDN January 2000 documentation of GetVersionEx */
-        return  (ovi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) &&
-                (ovi.dwMajorVersion <= 4) &&
-                (ovi.dwMinorVersion == 0) &&
-                (ovi.dwBuildNumber == 0x040003B6);
-
-    /* Something wrent wrong. So assume we have an older operating prior Win95 */
-
-    return TRUE;
-}
-
 /* magic Microsoft C++ compiler exception constant */
 #define EXCEPTION_MSC_CPP_EXCEPTION 0xe06d7363
 
@@ -295,7 +276,7 @@ static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP)
     {
         bNested = sal_True;
 
-        if ( bRaiseCrashReporter && ReportCrash( lpEP ) || IsWin95A() )
+        if ( bRaiseCrashReporter && ReportCrash( lpEP ) )
         {
             CallSignalHandler(&Info);
             Action = osl_Signal_ActKillApp;


More information about the Libreoffice-commits mailing list