diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-09-26 09:47:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-10-07 16:30:52 +0200 |
| commit | 9142f9a1a10f2df24f55e21b9203058bd0d2626a (patch) | |
| tree | e38d72c8eb8edf28fe6ad987597be768dfd83c91 /bean | |
| parent | ce285da92f95995a4e7c3a63713a8b004a1ab967 (diff) | |
WaE: win32 cleanup
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 25 | ||||
| -rw-r--r-- | bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 9 |
2 files changed, 0 insertions, 34 deletions
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c index eba60760be54..8954d05c14f5 100644 --- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c @@ -36,22 +36,7 @@ #include "jawt.h" -#if defined assert -#undef assert -#endif - -#define assert(X) if (!X) { (*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/RuntimeException"), "assertion failed"); return 0L;} - - #define SYSTEM_WIN32 1 -#define SYSTEM_WIN16 2 -#define SYSTEM_JAVA 3 -#define SYSTEM_MAC 5 -#define SYSTEM_XWINDOW 6 - -#define OLD_PROC_KEY "oldwindowproc" - -static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM ); JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow (JNIEnv * env, jobject obj_this); @@ -70,7 +55,6 @@ JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow return (SYSTEM_WIN32); } - /*****************************************************************************/ /* * Class: com_sun_star_beans_LocalOfficeWindow @@ -83,13 +67,4 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindo return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow( env, obj_this ); } - - - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c index 65078c849b4d..7ad112657c6d 100644 --- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -66,17 +66,11 @@ extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT #endif #define SYSTEM_WIN32 1 -#define SYSTEM_WIN16 2 -#define SYSTEM_JAVA 3 -#define SYSTEM_MAC 5 -#define SYSTEM_XWINDOW 6 #define OLD_PROC_KEY "oldwindowproc" static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM ); - - /* type must be something like java/lang/RuntimeException */ static void ThrowException(JNIEnv * env, char const * type, char const * msg) { @@ -126,7 +120,6 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative JAWT_DrawingSurface* ds; JAWT_DrawingSurfaceInfo* dsi; JAWT_Win32DrawingSurfaceInfo* dsi_win; - HDC hdc; HWND hWnd; LONG hFuncPtr; @@ -152,8 +145,6 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative /* Get the platform-specific drawing info */ dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo; - hdc = dsi_win->hdc; - hWnd = dsi_win->hwnd; /* Free the drawing surface info */ |