You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2023/01/03 07:31:29 UTC
[openoffice] branch trunk updated: Add the "'" entity definition to our HTML parser, so that we can correctly read it and convert it a "'", but when writing to HTML write out the "'" directly for now.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3304210c5c Add the "'" entity definition to our HTML parser, so that we can correctly read it and convert it a "'", but when writing to HTML write out the "'" directly for now.
3304210c5c is described below
commit 3304210c5c53f441cdb2c462fbbf6d8351380b01
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Tue Jan 3 08:41:13 2023 +0200
Add the "'" entity definition to our HTML parser, so that we can correctly
read it and convert it a "'", but when writing to HTML write out the "'"
directly for now.
Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=80657
Patch by: me
---
main/svtools/inc/svtools/htmlkywd.hxx | 1 +
main/svtools/source/svhtml/htmlkywd.cxx | 1 +
2 files changed, 2 insertions(+)
diff --git a/main/svtools/inc/svtools/htmlkywd.hxx b/main/svtools/inc/svtools/htmlkywd.hxx
index ff11057f1a..5ec2e37c79 100644
--- a/main/svtools/inc/svtools/htmlkywd.hxx
+++ b/main/svtools/inc/svtools/htmlkywd.hxx
@@ -182,6 +182,7 @@
#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
+#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute"
#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
diff --git a/main/svtools/source/svhtml/htmlkywd.cxx b/main/svtools/source/svhtml/htmlkywd.cxx
index 24b3160009..7554343ec6 100644
--- a/main/svtools/source/svhtml/htmlkywd.cxx
+++ b/main/svtools/source/svhtml/htmlkywd.cxx
@@ -278,6 +278,7 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
{{OOO_STRING_SVTOOLS_HTML_C_lt}, 60},
{{OOO_STRING_SVTOOLS_HTML_C_gt}, 62},
{{OOO_STRING_SVTOOLS_HTML_C_amp}, 38},
+ {{OOO_STRING_SVTOOLS_HTML_C_apos}, 39},
{{OOO_STRING_SVTOOLS_HTML_C_quot}, 34},
{{OOO_STRING_SVTOOLS_HTML_C_Agrave}, 192},