5 files changed, 12 insertions, 14 deletions
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 805ca84dc906..805ca84dc906 100755..100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 4436c0243f1d..4436c0243f1d 100755..100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 6db248c0ddb4..5e8930f4155f 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -34,9 +34,6 @@
 #include <svsys.h>
 #include <process.h>
 #endif
-#ifdef __MINGW32__
-#include <excpt.h>
-#endif
 
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
@@ -72,15 +69,19 @@
 #pragma warning( disable: 4917 )
 #endif
 
-#include <GdiPlus.h>
-#include <GdiPlusEnums.h>
-#include <GdiPlusColor.h>
-#include <Shlobj.h>
+#include <gdiplus.h>
+#include <gdiplusenums.h>
+#include <gdipluscolor.h>
+#include <shlobj.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
 
+#ifdef __MINGW32__
+#include <sehandler.hxx>
+#endif
+
 // =======================================================================
 
 void SalAbort( const XubString& rErrorText )
@@ -516,8 +517,6 @@ SalInstance* CreateSalInstance()
 
     // determine the windows version
     aSalShlData.mbWXP        = 0;
-    aSalShlData.mbWPrinter   = 0;
-    WORD nVer = (WORD)GetVersion();
     rtl_zeroMemory( &aSalShlData.maVersionInfo, sizeof(aSalShlData.maVersionInfo) );
     aSalShlData.maVersionInfo.dwOSVersionInfoSize = sizeof( aSalShlData.maVersionInfo );
     if ( GetVersionEx( &aSalShlData.maVersionInfo ) )
@@ -526,8 +525,6 @@ SalInstance* CreateSalInstance()
         if ( aSalShlData.maVersionInfo.dwMajorVersion > 5 ||
            ( aSalShlData.maVersionInfo.dwMajorVersion == 5 && aSalShlData.maVersionInfo.dwMinorVersion >= 1 ) )
             aSalShlData.mbWXP = 1;
-        if( aSalShlData.maVersionInfo.dwMajorVersion >= 5 )
-            aSalShlData.mbWPrinter = 1;
     }
 
     pSalData->mnAppThreadId = GetCurrentThreadId();
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index caebe9ca5b18..caebe9ca5b18 100755..100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 60c917475a94..5aab67d88cdd 100755..100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -29,13 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 #include <svsys.h>
-#ifdef __MINGW32__
-#include <excpt.h>
-#endif
 #include <win/saldata.hxx>
 #include <win/saltimer.h>
 #include <win/salinst.h>
 
+#ifdef __MINGW32__
+#include <sehandler.hxx>
+#endif
+
 // =======================================================================
 
 // Maximale Periode