summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-26 21:47:04 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-30 22:59:00 +0100
commita9fd489834b63e423d4745f0d71cf15396e3e3eb (patch)
treeebb37a0e8e6eca014747d7d50d0a3e6892007646 /vcl/win
parent4da020c5272aaddce3d9d8f1bad4c0cef8029a13 (diff)
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
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/window/salframe.cxx12
1 files changed, 0 insertions, 12 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 273d28e696f2..4227430bacc6 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