INTEGRATION: CWS warnings01 (1.4.6); FILE MERGED
2006/02/28 15:54:56 sb 1.4.6.2: #i53898# Made code waring-free. 2005/11/10 08:44:43 pl 1.4.6.1: #i53898# removed warnings
This commit is contained in:
@@ -4,9 +4,9 @@
|
|||||||
*
|
*
|
||||||
* $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $
|
* $RCSfile: com_sun_star_beans_LocalOfficeWindow.c,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.4 $
|
* $Revision: 1.5 $
|
||||||
*
|
*
|
||||||
* last change: $Author: rt $ $Date: 2005-09-07 22:03:48 $
|
* last change: $Author: hr $ $Date: 2006-06-19 20:03:11 $
|
||||||
*
|
*
|
||||||
* 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,10 +33,6 @@
|
|||||||
*
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
#if HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Intrinsic.h>
|
||||||
@@ -73,6 +69,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; /* avoid warning about unused parameter */
|
||||||
|
(void) obj_this; /* avoid warning about unused parameter */
|
||||||
return (SYSTEM_XWINDOW);
|
return (SYSTEM_XWINDOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,6 +84,8 @@ JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
|
|||||||
JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
|
JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
|
||||||
(JNIEnv * env, jobject obj_this)
|
(JNIEnv * env, jobject obj_this)
|
||||||
{
|
{
|
||||||
|
(void) env; /* avoid warning about unused parameter */
|
||||||
|
(void) obj_this; /* avoid warning about unused parameter */
|
||||||
return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow(env, obj_this);
|
return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow(env, obj_this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,9 +4,9 @@
|
|||||||
*
|
*
|
||||||
* $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $
|
* $RCSfile: com_sun_star_comp_beans_LocalOfficeWindow.c,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.4 $
|
* $Revision: 1.5 $
|
||||||
*
|
*
|
||||||
* last change: $Author: rt $ $Date: 2005-09-07 22:04:06 $
|
* last change: $Author: hr $ $Date: 2006-06-19 20:03:23 $
|
||||||
*
|
*
|
||||||
* 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,10 +33,6 @@
|
|||||||
*
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
#if HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Intrinsic.h>
|
||||||
@@ -80,6 +76,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; /* avoid warning about unused parameter */
|
||||||
|
(void) obj_this; /* avoid warning about unused parameter */
|
||||||
return (SYSTEM_XWINDOW);
|
return (SYSTEM_XWINDOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user