[Libreoffice-commits] core.git: bean/inc bean/Library_officebean.mk bean/native

[Stephan Bergmann]

 bean/Library_officebean.mk                                    |    5 -
 bean/inc/comp_LocalOfficeWindow.h                             |   28 ----------
 bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c  |    1 
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |    2 
 4 files changed, 36 deletions(-)

New commits:
commit b03eb878a8b77c3b5ff08d06d9fd0e5f1fe6dc89
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 2 18:31:10 2015 +0100

    Remove unnecessary bean/inc/comp_LocalOfficeWindow.h
    
    Change-Id: Ia3f5d11aace705f36016aabda7f325ba46aa8640

diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 00cfc43..9d916b3 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -11,11 +11,6 @@
 
 $(eval $(call gb_Library_Library,officebean))
 
-$(eval $(call gb_Library_set_include,officebean,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/bean/inc \
-))
-
 $(eval $(call gb_Library_use_externals,officebean,\
 	jawt \
 ))
diff --git a/bean/inc/comp_LocalOfficeWindow.h b/bean/inc/comp_LocalOfficeWindow.h
deleted file mode 100644
index e540e3b..0000000
--- a/bean/inc/comp_LocalOfficeWindow.h
+++ /dev/null
@@ -1,28 +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 "sal/types.h"
-#include "jni.h"
-
-SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
-  (JNIEnv * env, jobject obj_this);
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index c3452b2..0bd0e04 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -29,7 +29,6 @@
 #include "jawt.h"
 
 #include "sal/types.h"
-#include "comp_LocalOfficeWindow.h"
 
 #define SYSTEM_XWINDOW 6
 
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 dc0b7f9..b4c4162 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -29,8 +29,6 @@
 #include "jawt.h"
 #undef JAWT_GetAWT
 
-#include "comp_LocalOfficeWindow.h"
-
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif