mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.3.6); FILE MERGED

Browse Source 
2006/02/28 15:54:57 sb 1.3.6.1: #i53898# Made code waring-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 19:03:53 +00:00
parent 39f28b6025
commit 63845eab08
2 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $ * $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 22:04:20 $ * last change: $Author: hr $ $Date: 2006-06-19 20:03:36 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -33,14 +33,23 @@
* *
************************************************************************/ ************************************************************************/
#if HAVE_CONFIG_H #if defined _MSC_VER
#include <config.h> #pragma warning(push, 1)
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
#endif #endif
#include <windows.h>
#include "jawt.h" #include "jawt.h"
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#include "jawt_md.h" #include "jawt_md.h"
#if defined _MSC_VER
#pragma warning(pop)
#endif
#if defined assert #if defined assert
#undef assert #undef assert
@@ -72,6 +81,8 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
(JNIEnv * env, jobject obj_this) (JNIEnv * env, jobject obj_this)
{ {
(void) env; // unused
(void) obj_this; // unused
return (SYSTEM_WIN32); return (SYSTEM_WIN32);
} }

30
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $ * $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 22:04:36 $ * last change: $Author: hr $ $Date: 2006-06-19 20:03:53 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -33,14 +33,23 @@
* *
************************************************************************/ ************************************************************************/
#if HAVE_CONFIG_H #if defined _MSC_VER
#include <config.h> #pragma warning(push, 1)
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
#endif #endif
#include <windows.h>
#include "jawt.h" #include "jawt.h"
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#include "jawt_md.h" #include "jawt_md.h"
#if defined _MSC_VER
#pragma warning(pop)
#endif
#define SYSTEM_WIN32 1 #define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2 #define SYSTEM_WIN16 2
@@ -82,6 +91,8 @@ static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
JNIEXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType JNIEXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
(JNIEnv * env, jobject obj_this) (JNIEnv * env, jobject obj_this)
{ {
(void) env; // unused
(void) obj_this; // unused
return (SYSTEM_WIN32); return (SYSTEM_WIN32);
} }
@@ -192,8 +203,15 @@ static LRESULT APIENTRY OpenOfficeWndProc(
} }
} }
#if defined _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4152) /* function/data pointer conversion: */
#endif
return CallWindowProc(GetProp(hWnd, OLD_PROC_KEY), return CallWindowProc(GetProp(hWnd, OLD_PROC_KEY),
hWnd, uMsg, wParam, lParam); hWnd, uMsg, wParam, lParam);
#if defined _MSC_VER
#pragma warning(pop)
#endif
} }