summaryrefslogtreecommitdiff
path: root/bean
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-25 14:57:44 +0200
committerNoel Grandin <noel@peralex.com>2014-07-11 14:12:25 +0200
commitdac4ca5f682fdd0c3eee7f7ee1d98c9b3c8b7ce4 (patch)
treef0f66445c3f396759c41d7e3294e728653dbfa88 /bean
parent28b6325901138a6267320902ec889fc434ddde91 (diff)
new loplugin: externalandnotdefined
Find "missing headers," where a function is declared directly in the .cxx (as extern) and not defined, and should arguably instead be declared in an include file. Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2
Diffstat (limited to 'bean')
-rw-r--r--bean/Library_officebean.mk5
-rw-r--r--bean/inc/comp_LocalOfficeWindow.h28
-rw-r--r--bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c4
-rw-r--r--bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c1
-rw-r--r--bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c4
-rw-r--r--bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c2
6 files changed, 38 insertions, 6 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index a865e74409d8..ad620cbdcdf0 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -11,6 +11,11 @@
$(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
new file mode 100644
index 000000000000..e540e3b9edea
--- /dev/null
+++ b/bean/inc/comp_LocalOfficeWindow.h
@@ -0,0 +1,28 @@
+/* -*- 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_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 79193827cc1b..2acabb654858 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
@@ -29,12 +29,10 @@
#include "jawt.h"
#include "sal/types.h"
+#include "comp_LocalOfficeWindow.h"
#define SYSTEM_XWINDOW 6
-SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this);
-
/*****************************************************************************/
/*
* Class: com_sun_star_comp_beans_LocalOfficeWindow
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 0bd0e04e2ce5..c3452b2f80a8 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -29,6 +29,7 @@
#include "jawt.h"
#include "sal/types.h"
+#include "comp_LocalOfficeWindow.h"
#define SYSTEM_XWINDOW 6
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index 04094202f632..15c7fa5c7493 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -26,12 +26,10 @@
#endif
#include "jawt.h"
+#include "comp_LocalOfficeWindow.h"
#define SYSTEM_WIN32 1
-JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
- (JNIEnv * env, jobject obj_this);
-
/*****************************************************************************/
/*
* Class: com_sun_star_beans_LocalOfficeWindow
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 b4c41623c454..dc0b7f9d03e4 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -29,6 +29,8 @@
#include "jawt.h"
#undef JAWT_GetAWT
+#include "comp_LocalOfficeWindow.h"
+
#if defined _MSC_VER
#pragma warning(push, 1)
#endif