ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

move Java from config_features to already existing config_java

Browse Source 
Change-Id: I085fab2bcdc5910d1386fc20768fe7063ce3e28e
Reviewed-on: https://gerrit.libreoffice.org/54071
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
This commit is contained in:
Rene Engelhard
2018-05-10 22:44:37 +02:00
parent a4d35e9ed6
commit e37135d413
21 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config_host/config_features.h.in
-8
View File
@@ -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
config_host/config_java.h.in
+8
View File
@@ -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
connectivity/source/commontools/CommonTools.cxx
+1 -1
View File
@@ -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>
cppu/source/uno/lbenv.cxx
+1 -1
View File
@@ -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>
cppu/source/uno/lbmap.cxx
+1 -1
View File
@@ -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"
cui/source/options/optjava.cxx
+1 -1
View File
@@ -22,7 +22,7 @@
#include <memory>
#include <vector>
#include <config_features.h>
#include <config_java.h>
#include "optaboutconfig.hxx"
#include "optjava.hxx"
cui/source/options/optjava.hxx
+1 -1
View File
@@ -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>
dbaccess/source/ui/dlg/ConnectionPage.cxx
+1 -1
View File
@@ -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>
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+1 -1
View File
@@ -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>
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+1 -1
View File
@@ -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"
dbaccess/source/ui/dlg/detailpages.cxx
+1 -1
View File
@@ -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>
desktop/source/app/app.cxx
+1
View File
@@ -19,6 +19,7 @@
#include <memory>
#include <config_features.h>
#include <config_java.h>
#include <config_folders.h>
#include <sal/config.h>
desktop/source/app/desktopcontext.cxx
+1 -1
View File
@@ -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"
desktop/unx/source/start.c
+1 -1
View File
@@ -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>
include/connectivity/CommonTools.hxx
+1 -1
View File
@@ -20,7 +20,7 @@
#define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
#include <sal/config.h>
#include <config_features.h>
#include <config_java.h>
#include <map>
sfx2/source/control/unoctitm.cxx
+1 -1
View File
@@ -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>
sw/inc/SwAppletImpl.hxx
+1 -1
View File
@@ -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>
sw/source/filter/html/htmlplug.cxx
+1 -1
View File
@@ -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>
sw/source/filter/html/swhtml.cxx
+1 -1
View File
@@ -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>
sw/source/filter/html/swhtml.hxx
+1 -1
View File
@@ -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>
vcl/source/window/syschild.cxx
+1 -1
View File
@@ -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>