diff options
Diffstat (limited to 'vcl/win/app')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 32 | ||||
| -rw-r--r-- | vcl/win/app/saltimer.cxx | 19 |
2 files changed, 0 insertions, 51 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 0d00e4719872..4f270bc7845f 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -59,13 +59,6 @@ #pragma warning( disable: 4917 ) #endif -#ifdef __MINGW32__ -#ifdef GetObject -#undef GetObject -#endif -#define GetObject GetObjectA -#endif - #include "prewin.h" #include <gdiplus.h> @@ -76,20 +69,10 @@ #endif #include "postwin.h" -#ifdef __MINGW32__ -#ifdef GetObject -#undef GetObject -#endif -#endif - #if defined _MSC_VER #pragma warning(pop) #endif -#ifdef __MINGW32__ -#include <sehandler.hxx> -#endif - void SalAbort( const OUString& rErrorText, bool ) { ImplFreeSalGDI(); @@ -756,25 +739,13 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa { int bDef = TRUE; LRESULT nRet = 0; -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - jmp_buf jmpbuf; - __SEHandler han; - if (__builtin_setjmp(jmpbuf) == 0) - { - han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER); -#else __try { -#endif nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef ); } -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - han.Reset(); -#else __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation())) { } -#endif if ( bDef ) { if ( !ImplHandleGlobalMsg( hWnd, nMsg, wParam, lParam, nRet ) ) @@ -1031,8 +1002,6 @@ SalSession* WinSalInstance::CreateSalSession() return nullptr; } -#if !defined ( __MINGW32__ ) || defined ( _WIN64 ) - int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POINTERS pExceptionInfo) { // Decide if an exception is a c++ (mostly UNO) exception or a process violation. @@ -1048,7 +1017,6 @@ int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POIN return UnhandledExceptionFilter( pExceptionInfo ); } -#endif OUString WinSalInstance::getOSVersion() { diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index 7930ac9e0b6c..8a21780e6d1e 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -22,10 +22,6 @@ #include <win/saltimer.h> #include <win/salinst.h> -#if defined ( __MINGW32__ ) -#include <sehandler.hxx> -#endif - // maximum period #define MAX_SYSPERIOD 65533 @@ -119,17 +115,8 @@ at better resolution than 10ms. */ void CALLBACK SalTimerProc(PVOID, BOOLEAN) { -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - jmp_buf jmpbuf; - __SEHandler han; - if (__builtin_setjmp(jmpbuf) == 0) - { - han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER); -#else __try { -#endif - SalData* pSalData = GetSalData(); // always post message when the timer fires, we will remove the ones @@ -140,16 +127,10 @@ void CALLBACK SalTimerProc(PVOID, BOOLEAN) if (0 == ret) // SEH prevents using SAL_WARN here? fputs("ERROR: PostMessage() failed!", stderr); #endif - -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - } - han.Reset(); -#else } __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation())) { } -#endif } /** Called in the main thread. |