diff --git a/java-encoding.patch b/java-encoding.patch
index 2c7d6a8..e760949 100644
--- a/java-encoding.patch
+++ b/java-encoding.patch
@@ -1,15 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index d99b67676177..10746af8ed1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8429,6 +8429,7 @@ if test "$with_java" != "no"; then
-         BUILD_TYPE="$BUILD_TYPE HSQLDB"
-         AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1])
-         javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk`
-+		echo "$javanumver"
-         if expr "$javanumver" '>=' 000100060000 > /dev/null; then
-             AC_MSG_RESULT([yes])
-             HSQLDB_USE_JDBC_4_1=TRUE
 diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
 index d20927f8eb27..6a1bd00736ee 100644
 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java