fpicker/source/win32/filepicker/platform_xp.h | 4 ++-- vcl/win/source/window/salframe.cxx | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-)
New commits: commit a9fd489834b63e423d4745f0d71cf15396e3e3eb Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Oct 26 21:47:04 2013 +0200 windows: remove WINVER check This check is no longer necessary as we require at least Windows XP, which is 0x0501. It was implemented for ImmGetProperty(). Came in with 011bcd1ea1e8ce10f6b9946d8d44d05a59387b8c Change-Id: If94d6e99e7f474d931546326bd6c96f2cfa4cfcd diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 273d28e..4227430 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -17,13 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// i72022: ad-hoc to forcibly enable reconversion -#if WINVER < 0x0500 -#undef WINVER -#define WINVER 0x0500 -#endif - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -5484,7 +5477,6 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) } // ----------------------------------------------------------------------- -#if WINVER >= 0x0500 static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) { @@ -5607,8 +5599,6 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) { return TRUE; } -#endif // WINVER >= 0x0500 - // ----------------------------------------------------------------------- void SalTestMouseLeave() @@ -6022,7 +6012,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP nRet = 1; } break; -#if WINVER >= 0x0500 case WM_IME_REQUEST: if ( (sal_uIntPtr)( wParam ) == IMR_RECONVERTSTRING ) { @@ -6040,7 +6029,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP rDef = FALSE; } break; -#endif // WINVER >= 0x0500 } // catch WheelMouse-Message commit 4da020c5272aaddce3d9d8f1bad4c0cef8029a13 Author: Thomas Arnhold <tho...@arnhold.org> Date: Wed Oct 30 22:58:19 2013 +0100 Windows XP is 0x0501 See http://msdn.microsoft.com/en-us/library/aa383745.aspx And as we support only XP as minimum change this. Change-Id: Iad51b0dd4bb960ed5a270b0b701ec3e0b28ab4e2 diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h index 89c99ef..6a502f6 100644 --- a/fpicker/source/win32/filepicker/platform_xp.h +++ b/fpicker/source/win32/filepicker/platform_xp.h @@ -28,8 +28,8 @@ #undef _WIN32_IE #undef _WTL_NO_CSTRING -#define WINVER 0x0500 -#define _WIN32_WINNT 0x0500 +#define WINVER 0x0501 +#define _WIN32_WINNT 0x0501 #define _WIN32_IE 0x0600 #define _WTL_NO_CSTRING _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits