[Libreoffice-commits] core.git: include/svtools svtools/source

[Damjan Jovanovic (via logerrit)]

 include/svtools/htmlkywd.hxx       |    1 +
 svtools/source/svhtml/htmlkywd.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 28341f0b107b7bcd1377cec68c90eee9c4f27e1c
Author:     Damjan Jovanovic <dam...@apache.org>
AuthorDate: Tue Jan 3 08:41:13 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Mar 20 14:45:17 2023 +0000

    tdf#154273: Add the "&apos;" 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
    
    Cherry-picked from
    
https://github.com/apache/openoffice/commit/3304210c5c53f441cdb2c462fbbf6d8351380b01
    "Add the "&apos;" entity definition to our HTML parser, so that we can…"
    
    Change-Id: I10d07af5f49d2432d99a79318d9d95b0bc976637
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149150
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 9a84cddd37bf..cdcee168acba 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -150,6 +150,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/svtools/source/svhtml/htmlkywd.cxx 
b/svtools/source/svhtml/htmlkywd.cxx
index 584322fac8bc..5f81b3e3ca30 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -203,6 +203,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = {
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt),             60},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt),             62},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp),        38},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_apos),        39},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot),       34},
 
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),        192},