You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/20 15:25:03 UTC
[openoffice] branch AOO42X updated (334b405c86 -> 7c743047c0)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 334b405c86 Cleanup Make files
new 0b9d4b226f Integrate patch from upstream
new 7c743047c0 Copy graphics for markers to classic theme
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/hsqldb/makefile.mk | 2 +-
main/hsqldb/patches/script.patch | 13 +++++++++++++
.../classic/classic_images.tar.gz | Bin 1860450 -> 1880258 bytes
3 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 main/hsqldb/patches/script.patch
[openoffice] 02/02: Copy graphics for markers to classic theme
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7c743047c0ee209ab5a3b21a817e07c9cf3704be
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Feb 20 02:28:33 2023 +0100
Copy graphics for markers to classic theme
(cherry picked from commit 79fc337edd78bc30539d913926cb6016e3b6335d)
---
.../classic/classic_images.tar.gz | Bin 1860450 -> 1880258 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz
index 955222bdc9..cfc205b8d7 100644
Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
[openoffice] 01/02: Integrate patch from upstream
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0b9d4b226f8d42af9c8a170ec69ec1c77044e2e1
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sun Feb 19 20:42:36 2023 +0100
Integrate patch from upstream
(cherry picked from commit 248a2d540f4820a645c8853244fc959fbb9d7a8d)
---
main/hsqldb/makefile.mk | 2 +-
main/hsqldb/patches/script.patch | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk
index 6733b2e273..6f1d193b75 100644
--- a/main/hsqldb/makefile.mk
+++ b/main/hsqldb/makefile.mk
@@ -49,7 +49,7 @@ CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
src$/org$/hsqldb$/Library.java
-PATCH_FILES=patches$/i121754.patch
+PATCH_FILES=patches$/i121754.patch patches$/script.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/main/hsqldb/patches/script.patch b/main/hsqldb/patches/script.patch
new file mode 100644
index 0000000000..dc722d8198
--- /dev/null
+++ b/main/hsqldb/patches/script.patch
@@ -0,0 +1,13 @@
+diff -ru misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java
+--- misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2008-05-27 14:26:44.000000000 +0200
++++ misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-19 15:28:44.167555700 +0100
+@@ -402,6 +402,9 @@
+ if (tokenizer.getType() != Types.VARCHAR) {
+ throw Trace.error(Trace.INVALID_IDENTIFIER);
+ }
++ if (session.isProcessingScript() || session.isProcessingLog()) {
++ return new Result(ResultConstants.UPDATECOUNT);
++ }
+
+ dsw = new ScriptWriterText(database, token, true, true, true);
+