This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch hsqldb2 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit aac6cdf4a7e9a90fd43e6d3ff467c9a77a9c21ac Author: Jim Jagielski <[email protected]> AuthorDate: Sun Nov 8 07:38:34 2026 -0500 hsqldb: drop whitespace changes in HStorageMap.cxx, restore a makefile comment --- main/connectivity/source/drivers/hsqldb/HStorageMap.cxx | 4 ++-- main/hsqldb/makefile.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 56607a1ac8..1300df1c79 100644 --- a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -58,8 +58,8 @@ namespace connectivity { try { - m_xStream.clear(); - m_xSeek.clear(); + m_xStream.clear(); + m_xSeek.clear(); if ( m_xInputStream.is() ) { m_xInputStream->closeInput(); diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk index baed998fb7..351708e0e9 100644 --- a/main/hsqldb/makefile.mk +++ b/main/hsqldb/makefile.mk @@ -50,6 +50,8 @@ CONVERTFILES=build$/build.xml \ PATCH_FILES=patches$/aoo_integration.patch patches$/jar_duplicates.patch +# hsqldb's build.xml javac tasks specify no source/target; pin them so bytecode +# stays Java 8 compatible regardless of the (possibly much newer) build JDK. JAVAC_SRCTGT=-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 .IF "$(JAVACISGCJ)"=="yes"
