summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2018-05-09 23:20:23 +0000
committerRene Engelhard <rene@debian.org>2018-05-10 22:44:37 +0200
commite37135d4139f7c614c46fff6f82d519a05f1d9f8 (patch)
tree49616085b2807e2972d22f86efa4e46ceac10250
parenta4d35e9ed6b26d329d05bc4f39e21aac34510e0a (diff)
move Java from config_features to already existing config_java
Change-Id: I085fab2bcdc5910d1386fc20768fe7063ce3e28e Reviewed-on: https://gerrit.libreoffice.org/54071 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
Diffstat
-rw-r--r--config_host/config_features.h.in8
-rw-r--r--config_host/config_java.h.in8
-rw-r--r--connectivity/source/commontools/CommonTools.cxx2
-rw-r--r--cppu/source/uno/lbenv.cxx2
-rw-r--r--cppu/source/uno/lbmap.cxx2
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx2
-rw-r--r--desktop/source/app/app.cxx1
-rw-r--r--desktop/source/app/desktopcontext.cxx2
-rw-r--r--desktop/unx/source/start.c2
-rw-r--r--include/connectivity/CommonTools.hxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--sw/inc/SwAppletImpl.hxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/html/swhtml.hxx2
-rw-r--r--vcl/source/window/syschild.cxx2
21 files changed, 27 insertions, 26 deletions
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 75845dcf3286..d631ae1c0e42 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -7,14 +7,6 @@
#ifndef CONFIG_FEATURES_H
#define CONFIG_FEATURES_H
-/* JAVA
- *
- * Whether we have support for Java extensions, and use own Java
- * functionality).
- */
-
-#define HAVE_FEATURE_JAVA 0
-
/* DESKTOP - Whether we have a "normal" desktop UI or not.
*
* Non-DESKTOP in practice means touch-based mobile devices, Android
diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in
index 8b23de922488..8f05ec6267cf 100644
--- a/config_host/config_java.h.in
+++ b/config_host/config_java.h.in
@@ -1,6 +1,14 @@
#ifndef CONFIG_JAVA_H
#define CONFIG_JAVA_H
+/* JAVA
+ *
+ * Whether we have support for Java extensions, and use own Java
+ * functionality).
+ */
+
+#define HAVE_FEATURE_JAVA 0
+
#undef JAVA_ARCH
#endif
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 371b2a63c0d2..a3c6a2fc2251 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <connectivity/CommonTools.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 7f40be041ec4..fa22dc661ecf 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <cppu/EnvDcp.hxx>
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 4c8aa60895ab..ca6e15ac6d43 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include "IdentityMapping.hxx"
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index eb81db248417..36d33c6116f5 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -22,7 +22,7 @@
#include <memory>
#include <vector>
-#include <config_features.h>
+#include <config_java.h>
#include "optaboutconfig.hxx"
#include "optjava.hxx"
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 6caaeeb4cfc3..ebc6ed2be45b 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX
-#include <config_features.h>
+#include <config_java.h>
#include <memory>
#include <vector>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 75577db17114..9575384f1009 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include "ConnectionPage.hxx"
#include <core_resource.hxx>
#include <dbu_dlg.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 4cdb11718bb0..b2ca1e21182e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include "DBSetupConnectionPages.hxx"
#include <core_resource.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index d3bdf381a3eb..f036b655d8cb 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <core_resource.hxx>
#include "TextConnectionHelper.hxx"
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 67da68cd9834..a78a7526416d 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <core_resource.hxx>
#include "detailpages.hxx"
#include <sqlmessage.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e13263d9b51d..27fb9aa036bc 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -19,6 +19,7 @@
#include <memory>
#include <config_features.h>
+#include <config_java.h>
#include <config_folders.h>
#include <sal/config.h>
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 6e91d8622eaf..364eacc63223 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include "desktopcontext.hxx"
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 54fbbcadb532..b32034517318 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <config_features.h>
+#include <config_java.h>
#include <signal.h>
#include <unistd.h>
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index 8168ca60d779..bfa0fb36d8ec 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
#include <sal/config.h>
-#include <config_features.h>
+#include <config_java.h>
#include <map>
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 327ba17d2a5b..0b02bd0f2ae4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <config_folders.h>
#include <tools/debug.hxx>
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index a12d8ed7f1fb..bf2f754995ca 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_INC_SWAPPLETIMPL_HXX
#define INCLUDED_SW_INC_SWAPPLETIMPL_HXX
-#include <config_features.h>
+#include <config_java.h>
#include <svl/itemset.hxx>
#include <svl/ownlist.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 570f9ac7a24a..19ef7252094a 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <hintids.hxx>
#include <rtl/strbuf.hxx>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0e7be1b9ed5f..dbf0da0a0d5e 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -21,7 +21,7 @@
#include <algorithm>
#include <memory>
-#include <config_features.h>
+#include <config_java.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index d9aee0d02d1e..d649f4a123e2 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_SWHTML_HXX
#define INCLUDED_SW_SOURCE_FILTER_HTML_SWHTML_HXX
-#include <config_features.h>
+#include <config_java.h>
#include <sfx2/sfxhtml.hxx>
#include <svl/macitem.hxx>
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 1496dfd2af90..9b36ab44bf43 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_java.h>
#include <rtl/process.h>
#include <rtl/ref.hxx>
generated by cgit (git 2.34.1) at 2025-02-21 04:13:25 +0000