summaryrefslogtreecommitdiff
path: root/bean
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-02 21:44:08 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-02 21:44:08 +0100
commit6ae099ff431eec9ec3b6a532b0bfedff8fa43d37 (patch)
tree490f54542dc76a6c69f2fed1b24dc1477180c6dc /bean
parent248fa06e017b30cd61e4900f1ec22805b5a5426c (diff)
Deprecated com.sun.star.beans is gone
Change-Id: Ifce16ea732dd79730bff7bfa6269bd8b1d8e8aa6
Diffstat (limited to 'bean')
-rw-r--r--bean/Library_officebean.mk2
-rw-r--r--bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c65
-rw-r--r--bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c59
3 files changed, 0 insertions, 126 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index ad620cbdcdf0..00cfc43d5f89 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -23,14 +23,12 @@ $(eval $(call gb_Library_use_externals,officebean,\
ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_cobjects,officebean,\
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
- bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
))
endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cobjects,officebean,\
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
- bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
))
endif
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
deleted file mode 100644
index 2acabb654858..000000000000
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sal/config.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "jni.h"
-
-#include "jawt_md.h"
-#include "jawt.h"
-
-#include "sal/types.h"
-#include "comp_LocalOfficeWindow.h"
-
-#define SYSTEM_XWINDOW 6
-
-/*****************************************************************************/
-/*
- * Class: com_sun_star_comp_beans_LocalOfficeWindow
- * Method: getNativeWindowSystemType
- * Signature: ()I
- */
-SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
- (JNIEnv * env, jobject obj_this)
-{
- (void) env; /* avoid warning about unused parameter */
- (void) obj_this; /* avoid warning about unused parameter */
- return (SYSTEM_XWINDOW);
-}
-
-
-/*****************************************************************************/
-/*
- * Class: com_sun_star_beans_LocalOfficeWindow
- * Method: getNativeWindow
- * Signature: ()J
- */
-SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
- (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);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
deleted file mode 100644
index 15c7fa5c7493..000000000000
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include "jawt.h"
-#include "comp_LocalOfficeWindow.h"
-
-#define SYSTEM_WIN32 1
-
-/*****************************************************************************/
-/*
- * Class: com_sun_star_beans_LocalOfficeWindow
- * Method: getNativeWindowSystemType
- * Signature: ()I
- */
-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);
-}
-
-/*****************************************************************************/
-/*
- * Class: com_sun_star_beans_LocalOfficeWindow
- * Method: getNativeWindow
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this)
-{
- return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow( env, obj_this );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */