diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-11-03 22:27:12 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-11-08 10:00:31 +0100 |
| commit | 2b65c716bfe4b71248abb40564ce043f7d316732 (patch) | |
| tree | 6455f089346e50c4957c4b52dc1d8bafed3c4ded /include | |
| parent | 116ca8bb673c5f13b9c1aea9be48c68e83ba2f78 (diff) | |
tdf#88821: Implement support for <meta charset="..."> for HTML import.
The editengine HTML import was not handling it at all, and consequently not
setting the right encoding when importing HTML in Calc.
Change-Id: I3ca3dd20f36cfb579fb7ae4cd3da63a69d97601e
(cherry picked from commit 84400eae86d7ae8e66f8247f4c4f3a717d90f8c0)
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/htmlkywd.hxx | 1 | ||||
| -rw-r--r-- | include/svtools/htmltokn.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx index 54309a7867d1..4cc24949fe2d 100644 --- a/include/svtools/htmlkywd.hxx +++ b/include/svtools/htmlkywd.hxx @@ -422,6 +422,7 @@ #define OOO_STRING_SVTOOLS_HTML_O_alt "alt" #define OOO_STRING_SVTOOLS_HTML_O_axis "axis" #define OOO_STRING_SVTOOLS_HTML_O_char "char" +#define OOO_STRING_SVTOOLS_HTML_O_charset "charset" #define OOO_STRING_SVTOOLS_HTML_O_class "class" #define OOO_STRING_SVTOOLS_HTML_O_code "code" #define OOO_STRING_SVTOOLS_HTML_O_codetype "codetype" diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h index eeea777477f2..37ca30e5f61d 100644 --- a/include/svtools/htmltokn.h +++ b/include/svtools/htmltokn.h @@ -308,6 +308,7 @@ HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END, HTML_O_ALT, HTML_O_AXIS, HTML_O_CHAR, // HTML3 Table Model Draft + HTML_O_CHARSET, HTML_O_CLASS, HTML_O_CODE, // HotJava HTML_O_CODETYPE, |