summaryrefslogtreecommitdiff
path: root/bean/native/win32
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 19:03:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 19:03:53 +0000
commit63845eab08aa2b5048539c20fac49f6b0ca07ef4 (patch)
treebc32a0229e4cffdd22c2883405d201e4dc996d29 /bean/native/win32
parent39f28b602537a32a2bb9ae036551f3fd3d3d6fb8 (diff)
INTEGRATION: CWS warnings01 (1.3.6); FILE MERGED
2006/02/28 15:54:57 sb 1.3.6.1: #i53898# Made code waring-free.
Diffstat (limited to 'bean/native/win32')
-rw-r--r--bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c21
-rw-r--r--bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c28
2 files changed, 39 insertions, 10 deletions
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index f0159565a224..258c4ccda9f4 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -4,9 +4,9 @@
*
* $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 terms of GNU Lesser General Public License Version 2.1.
@@ -33,14 +33,23 @@
*
************************************************************************/
-#if HAVE_CONFIG_H
-#include <config.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
#endif
-
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#include "jawt.h"
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
#include "jawt_md.h"
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#if defined 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
(JNIEnv * env, jobject obj_this)
{
+ (void) env; // unused
+ (void) obj_this; // unused
return (SYSTEM_WIN32);
}
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 402e87464167..d99b3e85726d 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -4,9 +4,9 @@
*
* $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 terms of GNU Lesser General Public License Version 2.1.
@@ -33,14 +33,23 @@
*
************************************************************************/
-#if HAVE_CONFIG_H
-#include <config.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
#endif
-
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#include "jawt.h"
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
#include "jawt_md.h"
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#define SYSTEM_WIN32 1
#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
(JNIEnv * env, jobject obj_this)
{
+ (void) env; // unused
+ (void) obj_this; // unused
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),
hWnd, uMsg, wParam, lParam);
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
}