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

Thomas Arnhold thomas at arnhold.org
Mon Oct 7 09:26:03 PDT 2013


 include/svtools/htmlkywd.hxx       |   29 ---------------------
 include/svtools/htmltokn.h         |   49 -------------------------------------
 svtools/source/svhtml/htmlkywd.cxx |   31 -----------------------
 3 files changed, 1 insertion(+), 108 deletions(-)

New commits:
commit 8e37c7ae282f10724d6322aa028a7dd6b698f071
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Oct 7 14:31:57 2013 +0200

    html: <li> is on/off - arrange list correctly
    
    despite the fact, that <li> tags are currently not closed...
    
    Change-Id: If77d99b8dfcb00e60d918e5ce5030e6e44a6e64a

diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index ada59e0..58830aa 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -49,7 +49,6 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_horzrule},        HTML_HORZRULE},
     {{OOO_STRING_SVTOOLS_HTML_image},          HTML_IMAGE},
     {{OOO_STRING_SVTOOLS_HTML_input},          HTML_INPUT},
-    {{OOO_STRING_SVTOOLS_HTML_li},            HTML_LI_ON},
     {{OOO_STRING_SVTOOLS_HTML_linebreak},      HTML_LINEBREAK},
     {{OOO_STRING_SVTOOLS_HTML_link},            HTML_LINK}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_meta},            HTML_META}, // HTML 3.0
@@ -104,6 +103,7 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_italic},        HTML_ITALIC_ON},
     {{OOO_STRING_SVTOOLS_HTML_keyboard},        HTML_KEYBOARD_ON},
     {{OOO_STRING_SVTOOLS_HTML_language},        HTML_LANGUAGE_ON},  // HTML 3.0
+    {{OOO_STRING_SVTOOLS_HTML_li},            HTML_LI_ON},
     {{OOO_STRING_SVTOOLS_HTML_listheader},  HTML_LISTHEADER_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_map},         HTML_MAP_ON},   // Netscape 2.0
     {{OOO_STRING_SVTOOLS_HTML_menulist},        HTML_MENULIST_ON},
commit 07ba28f6bb4830eb0239c5d6bc4999493a201249
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Oct 7 14:08:58 2013 +0200

    html: remove unused and unsupported tags
    
    Change-Id: Ibd44d716e70034ffe7d31e3f5dc2c547a822b0e1

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 68dde7d..1b53f89 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -31,47 +31,33 @@
 #define OOO_STRING_SVTOOLS_HTML_comment "!--"
 #define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE"
 #define OOO_STRING_SVTOOLS_HTML_embed "embed"
-#define OOO_STRING_SVTOOLS_HTML_figureoverlay "overlay"
 #define OOO_STRING_SVTOOLS_HTML_horzrule "hr"
-#define OOO_STRING_SVTOOLS_HTML_horztab "tab"
 #define OOO_STRING_SVTOOLS_HTML_image "img"
-#define OOO_STRING_SVTOOLS_HTML_image2 "image"
 #define OOO_STRING_SVTOOLS_HTML_input "input"
-#define OOO_STRING_SVTOOLS_HTML_isindex "isindex"
 #define OOO_STRING_SVTOOLS_HTML_linebreak "br"
 #define OOO_STRING_SVTOOLS_HTML_li "li"
 #define OOO_STRING_SVTOOLS_HTML_link "link"
 #define OOO_STRING_SVTOOLS_HTML_meta "meta"
-#define OOO_STRING_SVTOOLS_HTML_nextid "nextid"
 #define OOO_STRING_SVTOOLS_HTML_nobr "nobr"
-#define OOO_STRING_SVTOOLS_HTML_of "of"
 #define OOO_STRING_SVTOOLS_HTML_option "option"
 #define OOO_STRING_SVTOOLS_HTML_param "param"
-#define OOO_STRING_SVTOOLS_HTML_range "range"
 #define OOO_STRING_SVTOOLS_HTML_spacer "spacer"
-#define OOO_STRING_SVTOOLS_HTML_wbr "wbr"
 
 // diese werden wieder abgeschaltet
 #define OOO_STRING_SVTOOLS_HTML_abbreviation "abbrev"
-#define OOO_STRING_SVTOOLS_HTML_above "above"
 #define OOO_STRING_SVTOOLS_HTML_acronym "acronym"
 #define OOO_STRING_SVTOOLS_HTML_address "address"
 #define OOO_STRING_SVTOOLS_HTML_anchor "a"
 #define OOO_STRING_SVTOOLS_HTML_applet "applet"
-#define OOO_STRING_SVTOOLS_HTML_array "array"
 #define OOO_STRING_SVTOOLS_HTML_author "au"
 #define OOO_STRING_SVTOOLS_HTML_banner "banner"
-#define OOO_STRING_SVTOOLS_HTML_bar "bar"
 #define OOO_STRING_SVTOOLS_HTML_basefont "basefont"
-#define OOO_STRING_SVTOOLS_HTML_below "below"
 #define OOO_STRING_SVTOOLS_HTML_bigprint "big"
 #define OOO_STRING_SVTOOLS_HTML_blink "blink"
 #define OOO_STRING_SVTOOLS_HTML_blockquote "blockquote"
 #define OOO_STRING_SVTOOLS_HTML_blockquote30 "bq"
 #define OOO_STRING_SVTOOLS_HTML_body "body"
 #define OOO_STRING_SVTOOLS_HTML_bold "b"
-#define OOO_STRING_SVTOOLS_HTML_boldtext "bt"
-#define OOO_STRING_SVTOOLS_HTML_box "box"
 #define OOO_STRING_SVTOOLS_HTML_caption "caption"
 #define OOO_STRING_SVTOOLS_HTML_center "center"
 #define OOO_STRING_SVTOOLS_HTML_citiation "cite"
@@ -84,8 +70,6 @@
 #define OOO_STRING_SVTOOLS_HTML_deletedtext "del"
 #define OOO_STRING_SVTOOLS_HTML_dirlist "dir"
 #define OOO_STRING_SVTOOLS_HTML_division "div"
-#define OOO_STRING_SVTOOLS_HTML_dot "dot"
-#define OOO_STRING_SVTOOLS_HTML_doubledot "ddot"
 #define OOO_STRING_SVTOOLS_HTML_dt "dt"
 #define OOO_STRING_SVTOOLS_HTML_emphasis "em"
 #define OOO_STRING_SVTOOLS_HTML_figure "fig"
@@ -94,7 +78,6 @@
 #define OOO_STRING_SVTOOLS_HTML_form "form"
 #define OOO_STRING_SVTOOLS_HTML_frame "frame"
 #define OOO_STRING_SVTOOLS_HTML_frameset "frameset"
-#define OOO_STRING_SVTOOLS_HTML_hat "hat"
 #define OOO_STRING_SVTOOLS_HTML_head1 "h1"
 #define OOO_STRING_SVTOOLS_HTML_head2 "h2"
 #define OOO_STRING_SVTOOLS_HTML_head3 "h3"
@@ -104,16 +87,12 @@
 #define OOO_STRING_SVTOOLS_HTML_head "head"
 #define OOO_STRING_SVTOOLS_HTML_html "html"
 #define OOO_STRING_SVTOOLS_HTML_iframe "iframe"
-#define OOO_STRING_SVTOOLS_HTML_ilayer "ilayer"
 #define OOO_STRING_SVTOOLS_HTML_insertedtext "ins"
 #define OOO_STRING_SVTOOLS_HTML_italic "i"
-#define OOO_STRING_SVTOOLS_HTML_item "item"
 #define OOO_STRING_SVTOOLS_HTML_keyboard "kbd"
 #define OOO_STRING_SVTOOLS_HTML_language "lang"
-#define OOO_STRING_SVTOOLS_HTML_layer "layer"
 #define OOO_STRING_SVTOOLS_HTML_listheader "lh"
 #define OOO_STRING_SVTOOLS_HTML_map "map"
-#define OOO_STRING_SVTOOLS_HTML_math "math"
 #define OOO_STRING_SVTOOLS_HTML_menulist "menu"
 #define OOO_STRING_SVTOOLS_HTML_multicol "multicol"
 #define OOO_STRING_SVTOOLS_HTML_noembed "noembed"
@@ -127,15 +106,12 @@
 #define OOO_STRING_SVTOOLS_HTML_person "person"
 #define OOO_STRING_SVTOOLS_HTML_plaintext "t"
 #define OOO_STRING_SVTOOLS_HTML_preformtxt "pre"
-#define OOO_STRING_SVTOOLS_HTML_root "root"
-#define OOO_STRING_SVTOOLS_HTML_row "row"
 #define OOO_STRING_SVTOOLS_HTML_sample "samp"
 #define OOO_STRING_SVTOOLS_HTML_script "script"
 #define OOO_STRING_SVTOOLS_HTML_select "select"
 #define OOO_STRING_SVTOOLS_HTML_shortquote "q"
 #define OOO_STRING_SVTOOLS_HTML_smallprint "small"
 #define OOO_STRING_SVTOOLS_HTML_span "span"
-#define OOO_STRING_SVTOOLS_HTML_squareroot "aqrt"
 #define OOO_STRING_SVTOOLS_HTML_strikethrough "s"
 #define OOO_STRING_SVTOOLS_HTML_strong "strong"
 #define OOO_STRING_SVTOOLS_HTML_style "style"
@@ -147,17 +123,13 @@
 #define OOO_STRING_SVTOOLS_HTML_tableheader "th"
 #define OOO_STRING_SVTOOLS_HTML_tbody "tbody"
 #define OOO_STRING_SVTOOLS_HTML_teletype "tt"
-#define OOO_STRING_SVTOOLS_HTML_text "text"
 #define OOO_STRING_SVTOOLS_HTML_textarea "textarea"
-#define OOO_STRING_SVTOOLS_HTML_textflow "textflow"
 #define OOO_STRING_SVTOOLS_HTML_tfoot "tfoot"
 #define OOO_STRING_SVTOOLS_HTML_thead "thead"
-#define OOO_STRING_SVTOOLS_HTML_tilde "tilde"
 #define OOO_STRING_SVTOOLS_HTML_title "title"
 #define OOO_STRING_SVTOOLS_HTML_underline "u"
 #define OOO_STRING_SVTOOLS_HTML_unorderlist "ul"
 #define OOO_STRING_SVTOOLS_HTML_variable "var"
-#define OOO_STRING_SVTOOLS_HTML_vector "vec"
 
 // obsolete features
 #define OOO_STRING_SVTOOLS_HTML_xmp "xmp"
@@ -166,7 +138,6 @@
 // proposed features
 #define OOO_STRING_SVTOOLS_HTML_definstance "dfn"
 #define OOO_STRING_SVTOOLS_HTML_strike "strike"
-#define OOO_STRING_SVTOOLS_HTML_bgsound "bgsound"
 #define OOO_STRING_SVTOOLS_HTML_comment2 "comment"
 #define OOO_STRING_SVTOOLS_HTML_marquee "marquee"
 #define OOO_STRING_SVTOOLS_HTML_plaintext2 "plaintext"
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index f7ca353..c8f03f5 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -60,22 +60,15 @@ enum HTML_TOKEN_IDS
     HTML_COMMENT,
     HTML_DOCTYPE,
     HTML_EMBED, // Netscape 2.0            </EMBED> ignorieren
-    HTML_FIGUREOVERLAY, // HTML 3.0
     HTML_HORZRULE,                      // </HR> ignorieren
-    HTML_HORZTAB, // HTML 3.0
     HTML_IMAGE,                         // </IMG> ignorieren
     HTML_INPUT,                         // </INPUT> ignorieren
-    HTML_ISINDEX, // HTML 3.0
     HTML_LINEBREAK,                     // </BR> -> <BR>
     HTML_LINK, // HTML 3.0
     HTML_META, // HTML 3.0                 </META> ignorieren
-    HTML_NEXTID, // HTML 3.0
-    HTML_OF, // HTML 3.0
     HTML_OPTION,                        // </OPTION> ignorieren
     HTML_PARAM, // HotJava
-    HTML_RANGE, // HTML 3.0
     HTML_SPACER, // Netscape 3.0b5      // </SPACER> ignorieren
-    HTML_WBR, // Netscape
 
     // Tokens, die ueber HTML-Charakter erkannt werden
     HTML_NONBREAKSPACE,
@@ -85,8 +78,6 @@ enum HTML_TOKEN_IDS
     //  der off-Wert liegt immer dahinter (+1) !!
     HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0
     HTML_ABBREVIATION_OFF, // HTML 3.0
-    HTML_ABOVE_ON, // HTML 3.0
-    HTML_ABOVE_OFF, // HTML 3.0
     HTML_ACRONYM_ON, // HTML 3.0
     HTML_ACRONYM_OFF, // HTML 3.0
     HTML_ADDRESS_ON,
@@ -95,18 +86,12 @@ enum HTML_TOKEN_IDS
     HTML_ANCHOR_OFF,
     HTML_APPLET_ON, // HotJava
     HTML_APPLET_OFF, // HotJava
-    HTML_ARRAY_ON, // HTML 3.0
-    HTML_ARRAY_OFF, // HTML 3.0
     HTML_AUTHOR_ON, // HTML 3.0
     HTML_AUTHOR_OFF, // HTML 3.0
     HTML_BANNER_ON, // HTML 3.0
     HTML_BANNER_OFF, // HTML 3.0
-    HTML_BAR_ON, // HTML 3.0
-    HTML_BAR_OFF, // HTML 3.0
     HTML_BASEFONT_ON, // Netscape
     HTML_BASEFONT_OFF, // Netscape
-    HTML_BELOW_ON, // HTML 3.0
-    HTML_BELOW_OFF, // HTML 3.0
     HTML_BIGPRINT_ON, // HTML 3.0
     HTML_BIGPRINT_OFF, // HTML 3.0
     HTML_BLINK_ON, // Netscape
@@ -117,12 +102,8 @@ enum HTML_TOKEN_IDS
     HTML_BLOCKQUOTE_OFF,
     HTML_BODY_ON,
     HTML_BODY_OFF,
-    HTML_BOLDTEXT_ON, // HTML 3.0
-    HTML_BOLDTEXT_OFF, // HTML 3.0
     HTML_BOLD_ON,
     HTML_BOLD_OFF,
-    HTML_BOX_ON, // HTML 3.0
-    HTML_BOX_OFF, // HTML 3.0
     HTML_CAPTION_ON, // HTML 3.0
     HTML_CAPTION_OFF, // HTML 3.0
     HTML_CENTER_ON, // Netscape
@@ -147,10 +128,6 @@ enum HTML_TOKEN_IDS
     HTML_DIRLIST_OFF,
     HTML_DIVISION_ON, // HTML 3.0
     HTML_DIVISION_OFF, // HTML 3.0
-    HTML_DOT_ON, // HTML 3.0
-    HTML_DOT_OFF, // HTML 3.0
-    HTML_DOUBLEDOT_ON, // HTML 3.0
-    HTML_DOUBLEDOT_OFF, // HTML 3.0
     HTML_DT_ON,
     HTML_DT_OFF,
     HTML_EMPHASIS_ON,
@@ -167,8 +144,6 @@ enum HTML_TOKEN_IDS
     HTML_FRAME_OFF, // Netscape 2.0
     HTML_FRAMESET_ON, // Netscape 2.0
     HTML_FRAMESET_OFF, // Netscape 2.0
-    HTML_HAT_ON, // HTML 3.0
-    HTML_HAT_OFF, // HTML 3.0
     HTML_HEAD1_ON,
     HTML_HEAD1_OFF,
     HTML_HEAD2_ON,
@@ -187,18 +162,12 @@ enum HTML_TOKEN_IDS
     HTML_HTML_OFF,
     HTML_IFRAME_ON, // IE 3.0b2
     HTML_IFRAME_OFF, // IE 3.0b2
-    HTML_ILAYER_ON,
-    HTML_ILAYER_OFF,
     HTML_INSERTEDTEXT_ON, // HTML 3.0
     HTML_INSERTEDTEXT_OFF, // HTML 3.0
     HTML_ITALIC_ON,
     HTML_ITALIC_OFF,
-    HTML_ITEM_ON, // HTML 3.0
-    HTML_ITEM_OFF, // HTML 3.0
     HTML_KEYBOARD_ON,
     HTML_KEYBOARD_OFF,
-    HTML_LAYER_ON,
-    HTML_LAYER_OFF,
     HTML_LANGUAGE_ON, // HTML 3.0
     HTML_LANGUAGE_OFF, // HTML 3.0
     HTML_LISTHEADER_ON, // HTML 3.0
@@ -207,8 +176,6 @@ enum HTML_TOKEN_IDS
     HTML_LI_OFF,
     HTML_MAP_ON, // Netscape 2.0
     HTML_MAP_OFF, // Netscape 2.0
-    HTML_MATH_ON, // HTML 3.0
-    HTML_MATH_OFF, // HTML 3.0
     HTML_MENULIST_ON,
     HTML_MENULIST_OFF,
     HTML_MULTICOL_ON, // Netscape 3.0b5
@@ -235,10 +202,6 @@ enum HTML_TOKEN_IDS
     HTML_PLAINTEXT_OFF, // HTML 3.0
     HTML_PREFORMTXT_ON,
     HTML_PREFORMTXT_OFF,
-    HTML_ROOT_ON, // HTML 3.0
-    HTML_ROOT_OFF, // HTML 3.0
-    HTML_ROW_ON, // HTML 3.0
-    HTML_ROW_OFF, // HTML 3.0
     HTML_SAMPLE_ON,
     HTML_SAMPLE_OFF,
     HTML_SCRIPT_ON, // HTML 3.2
@@ -251,8 +214,6 @@ enum HTML_TOKEN_IDS
     HTML_SMALLPRINT_OFF, // HTML 3.0
     HTML_SPAN_ON, // Style Sheets
     HTML_SPAN_OFF, // Style Sheets
-    HTML_SQUAREROOT_ON, // HTML 3.0
-    HTML_SQUAREROOT_OFF, // HTML 3.0
     HTML_STRIKETHROUGH_ON, // HTML 3.0
     HTML_STRIKETHROUGH_OFF, // HTML 3.0
     HTML_STRONG_ON,
@@ -277,16 +238,10 @@ enum HTML_TOKEN_IDS
     HTML_TELETYPE_OFF,
     HTML_TEXTAREA_ON,
     HTML_TEXTAREA_OFF,
-    HTML_TEXTFLOW_ON, // HTML 3.2
-    HTML_TEXTFLOW_OFF, // HTML 3.2
-    HTML_TEXT_ON, // HTML 3.0
-    HTML_TEXT_OFF, // HTML 3.0
     HTML_TFOOT_ON, // HTML3 Table Model Draft
     HTML_TFOOT_OFF, // HTML3 Table Model Draft
     HTML_THEAD_ON, // HTML3 Table Model Draft
     HTML_THEAD_OFF, // HTML3 Table Model Draft
-    HTML_TILDE_ON, // HTML 3.0
-    HTML_TILDE_OFF, // HTML 3.0
     HTML_TITLE_ON,
     HTML_TITLE_OFF,
     HTML_UNDERLINE_ON,
@@ -295,8 +250,6 @@ enum HTML_TOKEN_IDS
     HTML_UNORDERLIST_OFF,
     HTML_VARIABLE_ON,
     HTML_VARIABLE_OFF,
-    HTML_VECTOR_ON, // HTML 3.0
-    HTML_VECTOR_OFF, // HTML 3.0
 
     // obsolete features
     HTML_XMP_ON,
@@ -313,8 +266,6 @@ enum HTML_TOKEN_IDS
     HTML_UNKNOWNCONTROL_ON,
     HTML_UNKNOWNCONTROL_OFF,
 
-    HTML_BGSOUND = HTML_TOKEN_MICROSOFT|HTML_TOKEN_START,
-
     HTML_COMMENT2_ON = HTML_TOKEN_MICROSOFT|HTML_TOKEN_ONOFF, // HTML 2.0 ?
     HTML_COMMENT2_OFF, // HTML 2.0 ?
     HTML_MARQUEE_ON,
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index fd451d6..ada59e0 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -46,45 +46,31 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_comment},     HTML_COMMENT},
     {{OOO_STRING_SVTOOLS_HTML_doctype},      HTML_DOCTYPE},
     {{OOO_STRING_SVTOOLS_HTML_embed},       HTML_EMBED},    // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_figureoverlay}, HTML_FIGUREOVERLAY},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_horzrule},        HTML_HORZRULE},
-    {{OOO_STRING_SVTOOLS_HTML_horztab},     HTML_HORZTAB},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_image},          HTML_IMAGE},
-    {{OOO_STRING_SVTOOLS_HTML_image2},         HTML_IMAGE},
     {{OOO_STRING_SVTOOLS_HTML_input},          HTML_INPUT},
-    {{OOO_STRING_SVTOOLS_HTML_isindex},     HTML_ISINDEX},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_li},            HTML_LI_ON},
     {{OOO_STRING_SVTOOLS_HTML_linebreak},      HTML_LINEBREAK},
     {{OOO_STRING_SVTOOLS_HTML_link},            HTML_LINK}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_meta},            HTML_META}, // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_nextid},      HTML_NEXTID},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_of},          HTML_OF},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_option},        HTML_OPTION},
     {{OOO_STRING_SVTOOLS_HTML_param},       HTML_PARAM},    // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_range},       HTML_RANGE},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_spacer},      HTML_SPACER},   // Netscape 3.0b5
-    {{OOO_STRING_SVTOOLS_HTML_wbr},         HTML_WBR},  // Netscape
 
     {{OOO_STRING_SVTOOLS_HTML_abbreviation},    HTML_ABBREVIATION_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_above},       HTML_ABOVE_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_acronym},     HTML_ACRONYM_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_address},      HTML_ADDRESS_ON},
     {{OOO_STRING_SVTOOLS_HTML_anchor},        HTML_ANCHOR_ON},
     {{OOO_STRING_SVTOOLS_HTML_applet},      HTML_APPLET_ON},    // HotJava
-    {{OOO_STRING_SVTOOLS_HTML_array},       HTML_ARRAY_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_author},      HTML_AUTHOR_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_banner},      HTML_BANNER_ON},    // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_bar},         HTML_BAR_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_basefont},        HTML_BASEFONT_ON},  // Netscape
-    {{OOO_STRING_SVTOOLS_HTML_below},       HTML_BELOW_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_bigprint},        HTML_BIGPRINT_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_blink},       HTML_BLINK_ON}, // Netscape
     {{OOO_STRING_SVTOOLS_HTML_blockquote},    HTML_BLOCKQUOTE_ON},
     {{OOO_STRING_SVTOOLS_HTML_blockquote30},    HTML_BLOCKQUOTE30_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_body},            HTML_BODY_ON},
     {{OOO_STRING_SVTOOLS_HTML_bold},            HTML_BOLD_ON},
-    {{OOO_STRING_SVTOOLS_HTML_boldtext},        HTML_BOLDTEXT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_box},         HTML_BOX_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_caption},     HTML_CAPTION_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_center},      HTML_CENTER_ON},    // Netscape
     {{OOO_STRING_SVTOOLS_HTML_citiation},      HTML_CITIATION_ON},
@@ -97,8 +83,6 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_deletedtext}, HTML_DELETEDTEXT_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_dirlist},      HTML_DIRLIST_ON},
     {{OOO_STRING_SVTOOLS_HTML_division},        HTML_DIVISION_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_dot},         HTML_DOT_ON},   // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_doubledot},   HTML_DOUBLEDOT_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_dt},            HTML_DT_ON},
     {{OOO_STRING_SVTOOLS_HTML_emphasis},        HTML_EMPHASIS_ON},
     {{OOO_STRING_SVTOOLS_HTML_figure},      HTML_FIGURE_ON},    // HTML 3.0
@@ -107,7 +91,6 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_form},            HTML_FORM_ON},
     {{OOO_STRING_SVTOOLS_HTML_frame},       HTML_FRAME_ON}, // Netscape 2.0
     {{OOO_STRING_SVTOOLS_HTML_frameset},        HTML_FRAMESET_ON},  // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_hat},         HTML_HAT_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_head},            HTML_HEAD_ON},
     {{OOO_STRING_SVTOOLS_HTML_head1},          HTML_HEAD1_ON},
     {{OOO_STRING_SVTOOLS_HTML_head2},          HTML_HEAD2_ON},
@@ -117,16 +100,12 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_head6},          HTML_HEAD6_ON},
     {{OOO_STRING_SVTOOLS_HTML_html},            HTML_HTML_ON},
     {{OOO_STRING_SVTOOLS_HTML_iframe},      HTML_IFRAME_ON},    // IE 3.0b2
-    {{OOO_STRING_SVTOOLS_HTML_ilayer},      HTML_ILAYER_ON},
     {{OOO_STRING_SVTOOLS_HTML_insertedtext},    HTML_INSERTEDTEXT_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_italic},        HTML_ITALIC_ON},
-    {{OOO_STRING_SVTOOLS_HTML_item},            HTML_ITEM_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_keyboard},        HTML_KEYBOARD_ON},
     {{OOO_STRING_SVTOOLS_HTML_language},        HTML_LANGUAGE_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_layer},       HTML_LAYER_ON},
     {{OOO_STRING_SVTOOLS_HTML_listheader},  HTML_LISTHEADER_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_map},         HTML_MAP_ON},   // Netscape 2.0
-    {{OOO_STRING_SVTOOLS_HTML_math},            HTML_MATH_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_menulist},        HTML_MENULIST_ON},
     {{OOO_STRING_SVTOOLS_HTML_multicol},        HTML_MULTICOL_ON},  // Netscape 3.0b5
     {{OOO_STRING_SVTOOLS_HTML_nobr},            HTML_NOBR_ON},  // Netscape
@@ -141,15 +120,12 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_person},      HTML_PERSON_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_plaintext},   HTML_PLAINTEXT_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_preformtxt},    HTML_PREFORMTXT_ON},
-    {{OOO_STRING_SVTOOLS_HTML_root},            HTML_ROOT_ON},  // HTML 3.0
-    {{OOO_STRING_SVTOOLS_HTML_row},         HTML_ROW_ON},   // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_sample},        HTML_SAMPLE_ON},
     {{OOO_STRING_SVTOOLS_HTML_script},        HTML_SCRIPT_ON}, // HTML 3.2
     {{OOO_STRING_SVTOOLS_HTML_select},        HTML_SELECT_ON},
     {{OOO_STRING_SVTOOLS_HTML_shortquote},  HTML_SHORTQUOTE_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_smallprint},  HTML_SMALLPRINT_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_span},            HTML_SPAN_ON},  // Style Sheets
-    {{OOO_STRING_SVTOOLS_HTML_squareroot},  HTML_SQUAREROOT_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_strikethrough},HTML_STRIKETHROUGH_ON},    // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_strong},        HTML_STRONG_ON},
     {{OOO_STRING_SVTOOLS_HTML_style},       HTML_STYLE_ON}, // HTML 3.0
@@ -161,17 +137,13 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_tablerow},        HTML_TABLEROW_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_tbody},          HTML_TBODY_ON}, // HTML 3 Table Model Draft
     {{OOO_STRING_SVTOOLS_HTML_teletype},        HTML_TELETYPE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_text},            HTML_TEXT_ON},  // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_textarea},        HTML_TEXTAREA_ON},
-    {{OOO_STRING_SVTOOLS_HTML_textflow},        HTML_TEXTFLOW_ON},
     {{OOO_STRING_SVTOOLS_HTML_tfoot},          HTML_TFOOT_ON}, // HTML 3 Table Model Draft
     {{OOO_STRING_SVTOOLS_HTML_thead},          HTML_THEAD_ON}, // HTML 3 Table Model Draft
-    {{OOO_STRING_SVTOOLS_HTML_tilde},       HTML_TILDE_ON}, // HTML 3.0
     {{OOO_STRING_SVTOOLS_HTML_title},          HTML_TITLE_ON},
     {{OOO_STRING_SVTOOLS_HTML_underline},      HTML_UNDERLINE_ON},
     {{OOO_STRING_SVTOOLS_HTML_unorderlist},  HTML_UNORDERLIST_ON},
     {{OOO_STRING_SVTOOLS_HTML_variable},        HTML_VARIABLE_ON},
-    {{OOO_STRING_SVTOOLS_HTML_vector},      HTML_VECTOR_ON},    // HTML 3.0
 
     {{OOO_STRING_SVTOOLS_HTML_xmp},         HTML_XMP_ON},
     {{OOO_STRING_SVTOOLS_HTML_listing},     HTML_LISTING_ON},
@@ -179,7 +151,6 @@ static HTML_TokenEntry aHTMLTokenTab[] = {
     {{OOO_STRING_SVTOOLS_HTML_definstance},  HTML_DEFINSTANCE_ON},
     {{OOO_STRING_SVTOOLS_HTML_strike},        HTML_STRIKE_ON},
 
-    {{OOO_STRING_SVTOOLS_HTML_bgsound},     HTML_BGSOUND},
     {{OOO_STRING_SVTOOLS_HTML_comment2},        HTML_COMMENT2_ON},
     {{OOO_STRING_SVTOOLS_HTML_marquee},         HTML_MARQUEE_ON},
     {{OOO_STRING_SVTOOLS_HTML_plaintext2},    HTML_PLAINTEXT2_ON},


More information about the Libreoffice-commits mailing list