aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-07-31 17:54:50 +0800
committermbr <mbr@FreeBSD.org>2002-07-31 17:54:50 +0800
commitbefdd3f392a32aec05d87d36786d1d49ff77bf9d (patch)
treee515dd135f22f69add42f5837617de147d86f8fb /editors/openoffice
parentbdb25b49e50cc3d0db0a11d176d4a1320de6726c (diff)
downloadfreebsd-ports-gnome-befdd3f392a32aec05d87d36786d1d49ff77bf9d.tar.gz
freebsd-ports-gnome-befdd3f392a32aec05d87d36786d1d49ff77bf9d.tar.zst
freebsd-ports-gnome-befdd3f392a32aec05d87d36786d1d49ff77bf9d.zip
Fix i18n related crash. This may be only a workaround, a better solution
is in work. The crash doesn't happen if $LANG is set to *.ISO8859-* or to *.KOI8-R. It happens with $LANG=C, US_ASCII, *.KOI8-U, *.Big5 etc. The function which does crash should select the best suitable mime encoding type for $LANG. The workaround is to default to US-ASCII if there is no suitable entry. If the entry has been modified in the settings, this value will not be used anymore and the crash should even stop if we don't have this workaround in place.
Diffstat (limited to 'editors/openoffice')
-rw-r--r--editors/openoffice/files/patch-sal+textenc+tencinfo.c13
-rw-r--r--editors/openoffice/files/patch-sal::textenc::tencinfo.c13
2 files changed, 26 insertions, 0 deletions
diff --git a/editors/openoffice/files/patch-sal+textenc+tencinfo.c b/editors/openoffice/files/patch-sal+textenc+tencinfo.c
new file mode 100644
index 000000000000..7cf80c18d0a0
--- /dev/null
+++ b/editors/openoffice/files/patch-sal+textenc+tencinfo.c
@@ -0,0 +1,13 @@
+--- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002
++++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002
+@@ -695,6 +695,10 @@
+ /* characters. The function search for the first equal string in */
+ /* the table. In this table are only the most used mime types. */
+ /* Sort order: important */
++
++ if (pMimeCharset == NULL)
++ pMimeCharset = "usascii";
++
+ static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
+ {
+ { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice/files/patch-sal::textenc::tencinfo.c b/editors/openoffice/files/patch-sal::textenc::tencinfo.c
new file mode 100644
index 000000000000..7cf80c18d0a0
--- /dev/null
+++ b/editors/openoffice/files/patch-sal::textenc::tencinfo.c
@@ -0,0 +1,13 @@
+--- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002
++++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002
+@@ -695,6 +695,10 @@
+ /* characters. The function search for the first equal string in */
+ /* the table. In this table are only the most used mime types. */
+ /* Sort order: important */
++
++ if (pMimeCharset == NULL)
++ pMimeCharset = "usascii";
++
+ static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
+ {
+ { "usascii", RTL_TEXTENCODING_ASCII_US },